improve cloner HashMap usage