Cleenup #2
Fixes #2