clean up. close #21