Refactoring auth to simplify methods