Cleaned up tabbing

Cleaned up tabbing to be more consistent with how we've learned to do
it.