Comment analysis target and refactoring.
Refactoring.