Refine states