Minor reformatting

* Fix whitespace: no trailing ws, no mix of tabs and spaces.
* Fixed some comments