Refactor to refine