Explicitly add client to the proc
Refactor idioms and naming for methods