Improved formatting consistency