Adjusting code to code conventions

[jshoyos]

Nothing was added or removed other than comments and moved things around to follow the coding conventions. This is just a refactoring PR