All switch cases now one liners