Cleanup
Merge pull request #1 from joshfng/master

Cleanup