Some minor changes
Merge pull request #13 from boersmamarcel/refactor

Some minor changes