Simplify some code in a switch
Small comment wording tweak