Revert "Revert "Revert "some style and desc updates"""

This reverts commit e0cba4a7aac940ff54902a2a6b3d40ae0453887f.