Fixed some codingstyle issues
Merge pull request #23 from dennisdegreef/cleanup

Fixed some codingstyle issues