Code cleanup
Merge pull request #7 from Krystosterone/code-cleanup

Code cleanup