Finished improving readability.

I think I broke my tab key.