Code

Clean up formatting so that methods are not all run together. Helps with diffs.