Comment formatting revisions

Removed left over comments
Fixed extra spaces in comment blocks