Refactors for style and clarity.

Use 2 (not 1) spaces for indentation.