Spaces instead of tabs; more consistency in formatting
More cleanup
Merge branch 'whitespace'