Improved formatting options