shorthand redefinition fix
cleanup