Refactor code by using switch instead of if-else (#318)

Refactor code by using switch instead of if-else (#318) #53