Refine, no functional change