Clean up code.
Merge pull request #2 from Muunsyr/tidyCode

Clean up code.