Refactors for style and clarity.

Inconsistent indentation detected.