Fixed switch formatting