Used rq_auth citizen auth
minor refactor