refactored setting of the maturity and elapsed time variables