Revert "Revert "Revert "Code spacing consistency."""

This reverts commit f9dc91029dac5a2bdd76c342402ebab950416e57.