more changes to calculations formatting