eliminating rest of switch-on-enums