Some cleanup
fixes #29
#29 committing for backup