MIST-190 Clean up some switch blocks stylistically