mass whitespace cleanup
Merge pull request #3108 from rolandwalker/whitespace_cleanup

mass whitespace cleanup