Some minor refinement