Simplify code and update expiration timestamp.