improve code-cleaner