:construction: covered more use-cases to have the numbers properly formatted