Change if statement back to switch statement

Using a switch with a fall through instead of an if statement. Also found an unnecessary right parenthesis.