Feature/number formatting