Refactoring and Comment Clarification