refactoring.  also changing the expiry reset time to an hour