Comments and code cleanup
Trivial formatting changes