Formatting fixes.

Spaces to tabs, indents, etc.
Merge pull request #5412 from RoosterDragon/formatting

Formatting