refactoring expiration changes as per peer reviews