Minor cleanup, more consistent use of authenticated