Improving number formatting