Revert "Some style fixes"

This reverts commit ece79c97ce93a7a38718d0e221352717cacfe1ec.