final refinements and formatting