Cleaning whitespace with vim
enhancements in comments