add cookie expiration var, code clean