Revert "More style standardization"

This reverts commit 9a262b14bd7ea32c02e187f68db1769e1ca66cae.