Revert "Revert "clean a code""

This reverts commit 864594284c2d6dd481848445bfacaaae35731af9.