fixes #2
Cleanup
fixes #1