Minor refactor in rq3