Improved formatting of numbers