Cleanup
More cleanup
Merge pull request #179 from amire80/cleanup

Cleanup