Rework switch for readability