issue close #46 
slight clean up