Revert "Style fixes"

This reverts commit 3d78a702f6dc879da77ccdc4a6fcc60ab0601d29.