Improved formatting