Style optimization

Style optimization
Revert "Style optimization"

This reverts commit 8393152523b7eb355ad23bbb2e37602280f8d347.