fixes #7

Cleaned up a bit