Refactor method per code review