Whitespace cleanup
Merge pull request #26 from henrik/cleanup2

More whitespace cleanup