Project cleanup
Merge pull request #4 from tclarkwilliam/feature-cleanup

Project cleanup