Patch/refactor spread