Fixed some minor issues from Scrutinizer
Merge pull request #15 from dennisdegreef/cleanup

Fixed some minor issues from Scrutinizer