Fixing casing for the switch
Reducing CPU usage by avoiding down casing