Cleanups
Merge pull request #2 from claws/cleanups

Cleanups