Refactoring ClientAssignments