Minor changes

- Changing all string literal based `switch` statements to `if/else` for optimal performance