Revert "Polishing"

This reverts commit 3a419872c860e81f3232de0f8252b84730d5082c.