Added number formatting