fixed indentation and cleaned

Fixed some errant indentation and removed a chunk of "Switch" that got left behind when it was removed.  No functional changes.