Revert "Code formatting."

This reverts commit 4f6afd32ea149621c74c6d7d4f498795d3d1c58b.
Revert "Revert "Code formatting.""

This reverts commit 5a8eb250e9d2938146eb22421c94a80b6cbc0c26.