Refactoring expire