Small tidy up in authenticator class