some more refactoring on auth methods