identity - minor cleanup