Revert "Polish"

This reverts commit a034818aae6347b60400c1c59b3f53c17852c48b.