More refactoring of client class/method.