Cleanup some whitespace
Merge branch 'fix-cleanup-little-whitespace'