Removed redundant exit
Spaced switches out better