continue on refactoring of switch statements