Cleanup.
Merge pull request #3 from darkmoonsinger/master

Cleanup.