General style update
Revert "General style update"

This reverts commit dfbbc41f42f9ea374f27c2d45b4e7aebd4556a9d.
General style update