cleaned up authenticator a bit