Replaced if/else's with switch statements

This was just... EEK!
Space after `switch`