Spacing and brace changes to make code more readable