Refactoring und Code Cleanup von Sven
Merge pull request #18 from mapthegod/cleanup

Refactoring und Code Cleanup von Sven