Revert "Style fixes"

This reverts commit 86e430d2c5df54b6ae13f2ce7b90a7ec14a16205.