Stop using tabs incorrectly

But added training wheels to make the transition easier
tab fix