some refactoring, login auth_token