o Smallish cleanup: replace if/else/else with switch/case