Remainder of comments added normalized for searching

* Removed one comment

Applies to #264 and inclusive to #262