stitchers refactor