use match statement instead of ifs (#56)

use match statement instead of ifs (#56) #42