tidy up the Auth service a bit