Client: Refactor