Cleaned up token authentication