more clean up and normalize refinements