Code cleanup
code cleanup by architekt
code cleanup by architekt
Merge pull request #1 from schinken/code-cleanup

Code cleanup