Revert "Style changes"

This reverts commit 46c4b0f57ac6af9c72360f27df2cc587758dbf19.
Revert "Revert "Style changes""

This reverts commit 9e238f2487818a9a423e114a71597eb5e9ef1a0b.