Replaced if/else's with switch statement

We don't indent ``case`` (which I just learned from your last pull req, its weird not indenting case Zarel :()