First step to refactor response/request

Tests still pass!! :)