Misc code formatting
Misc code formatting and comments