cleaned up the switch