code cleaning, added request and q as deps