Fix typo and encoding problem
Remove trailing white space
Remove superfluous annotations
Remove more dummy annotations
Merge pull request #20 from tbeu/remove-trailing-white-space-and-dummy-annotations

Remove trailing white space and dummy annotations