Further format fine tuning