Cleanup
More cleanup
More cleanup
Merge pull request #6 from bakura10/cleanup

Cleanup