Added comments to be consistent with style guide

Adherence to code formatting from the style guide as well as some
spacing tweaks etc.