Cleanup

Wat codeduplicatie opgeruimd.
Merge pull request #1 from clone1612/cleanup

Cleanup