Add missing semicolon.
A bunch of modernizing for the switch user block. Still not complete. Feel free to help out.