Cleaned up some of the authentication checking to be called more consistently