Refactor how requests are performed