[BUGFIX] Various code cleanup
Merge pull request #1 from aertmann/master

[BUGFIX] Various code cleanup