some cleanup and refactor
Merge pull request #62 from Tritlo/cleanupAndRefactor

some cleanup and refactor