Refactoring auth.