Close #107
cleanups