Whitespace and style fixes Use C style comments as per style guide, and fix mismatching indentation.
2017-02-25T14:17:10