Redo indenation.

I really need to go through and reindent this whole thing.