Fix formatting both integer and float amounts