Simplify the auth code a bit more