Cleanup
Merge pull request #1 from earldouglas/cleanup

Cleanup