Fix grammar in comments.
Fix some indent problems.
Merge pull request #16 from OliverUv/cleanup

Cleanup