Revert "Minor style police"

This reverts commit 6344573cdb7e7c8e1ae880f0ed3c8bba15075cdb.