cleanup
close #60