Further format refinements