style update (WIP)
Revert "style update (WIP)"

This reverts commit 263c70e58b1aa5d04dc00c2954d97a418c0bdc2c.
resolved conflict