Refactor - number formatting