Little cleanup
Fixes #6
Fixes #3