Refactoring with a Comment partial form