Cleanup whitespace
- Removed trailing whitespace
- Corrected comment indent in some case
- Removed CR from line breaks (consequent unix lf now)