[CLEANUP] Number formatting