switch/case Formatting changes