refactor expire method in storage class