nit - we probably want something better than SOMECLIENT here but seeing as this is a straightforward refactoring maybe add a TODO