Refactoring (UTF-8 Encoding Comment Recover)