Clean-up continued
refine workflow