Refactoring after mentoring