Minor improvement of number formatting