Revert "Revert "style changes""

This reverts commit 85a8358326ad6ce0d84c7c0633509efb9b510407.
Revert "Revert "Revert "style changes"""

This reverts commit 7cfd6293917c599c548f3b8dfd0deca164da2d3c.