Condensed Case statement

Makes the switch easier to read