minor refinements
minor refinements