Factoring out to HerokuClient