Cleaner implementation
Merge pull request #1 from thijsdezoete/implementation_cleanup

Cleaner implementation