Clean AuthManager a bit