#12 prettied up the calculation type