Refactored Clients list