openid + refactor