openid_login cleanups

Some minor refactoring