Some refactoring around Expiry Date/Time