Cleanup.
Merge pull request #2 from Stavrus/cleanup

Cleanup.