tidy up of member enumeration