- Push calculation of expriry date into OfferType
- Push expiry date calculation into ExpirationType
- Get rid of conditional structures.