Cleaned up authreturn