Cleanup!
Merge pull request #33 from loed-idzinga/optimalisations

Cleanup!