[task] code cleanup
Merge pull request #88 from davidmoebius/code_cleanup02

Code cleanup02