refactoring expired? as suggested by Mark