Final format adjustments