Improvements to Switch statement [ci skip]