remove unnecessary whitespace.
Merge branch 'cleanup-whitespace'