Cleanup and further work on OpenID servlet