Cleanup
Merge pull request #1 from titanous/cleanup

Cleanup