cleaned up the project
Merge pull request #1 from octanner/cleanup

cleaned up the project