Client minor refactor