[cleanup] Cleaned up some of the code
Merge pull request #6 from amaxwell01/cleanup

[cleanup] Cleaned up some of the code