cleaning up codebase
Merge pull request #47 from mejackreed/master

cleaning up codebase