Some minor clean up

* Minor improvements of some comments
* Break long lines
* Remove end-of-line spaces
* Try to be more consistent with line spaces