issue close #38
cleaned up