It still feels like the logic in this section could be simplified, there is a lot of duplicate code. It seems like, at the least, `$this->makeRequest()` should only need to be called once.