fix all kind of white space errors
Merge pull request #1411 from jaapio/whitespace_fixes

fix all kind of white space errors