Refactor with Comfy