Adhere to code standard for braces/indentation

Need to add comments as classes are implemented.