Revert "Minor formatting changes."

This reverts commit 57120c82f2226d15dc5cef613067fd2048030d52.
Revert "Revert "Minor formatting changes.""

This reverts commit f28309b10da2551762c02e5a76eedb1c7c4cd389.