Code cleanup and support for OpenID using Google