Authorization header refactor