Refactor results