move and add props
cleanup