Fix var names and comment
Refractor the calculators to take the date with location instead of a ref to the calendar.