Revert "Polishing"

This reverts commit c8bbd0bae47c07c375de7df42e5019a10a3bffcc.