Refactor partial