Improved numbers formatting