issue close #25
clean up