cleanup
working on #92
fixed #92