Better number formatting
fixing potential bug