Refactor out request to own class