issue close #29

cleanup