Stitching in and formatting/cleanup