Merge pull request #24 from fitzfitsahero/code-cleanup

Code cleanup