[task] code cleanup
Merge pull request #75 from davidmoebius/code_cleanup

[task] code cleanup