Removed trailing whitespace and normalized to use space chars, never tabs

Removing trailing whitespace and normalizing to spaces (not sure if there were any tabs, actually) should make future PRs easier.