Adding comments
Removing request dependency