More comment cleanup and code simplification

No changes to code, just restructuring of comments and spacing