Added space after switch/Removed spaces after unset

While at it, added/removed some other spaces in the same files

Change-Id: I84d8001aa123a008807ad5eb76f396aed7c899a4
Merge "Added space after switch/Removed spaces after unset"