Fixed some issues by CodeCleaner.