Enhancement:

 - Simplify Switch to boolean, and improve readability