Replaced if/else's with switch statements

This was just... EEK!
Blank newline before new `case`s