Refactored authenticated? checks