clean up code
Merge pull request #1 from Stefandasbach/codeCleanup

clean up code