Revert "Cosmetic changes"

This reverts commit 7f2b851ac820a601c49f20bbd8f2d32f94bf9f68.

revert commit for now