cleanup/refine