More cleanup.  Been bugging me for a while

PS2:  Missed 2 tabs.  All fixed, ready to go.

Change-Id: I40e388ec2d1ea6c3280cd498ea7dfab7440efdac