Switch...When...Or...Otherwise coding style removed

Reason: I didn't feel comfortable with this style