Cleanup.
Merge pull request #1 from dom1nga/cleanup

Cleanup.