Replace number_format to handle large numbers and overflow

Replace number_format to handle large numbers and overflow #530