[TASK] Code cleanup
Merge pull request #93 from bjo3rnf/cleanup

[TASK] Code cleanup