Revert "Code spacing consistency."

This reverts commit 1a6c05125f067a7d6703781a80d9317893c25206.
Revert "Revert "Code spacing consistency.""

This reverts commit 39e891043cd5bc0c0e30591da6c105706c0cdeb0.