Clean up all code
Merge pull request #1 from ryanseys/master

Clean up all code