Revert "Revert "some style changes""

This reverts commit 07a1d4eb1da105888481401caab9bfee8ab86664.