minor refinements