Cleanup.
Merge pull request #1 from Kizbitz/cleanup

Cleanup.