Minor update (0.3b)

Switched out several if statements with cases
Converted most unessecary longhand if statements to shorthand