More refactoring.

Chinese comments are being eliminated.