code cleanup
Merge pull request #2 from MickdeGraaf/dev

code cleanup