brief clean up

changed some if statements to switches for easier readability