work on #44
fix #44
cleanup