Refactor Client Code

Merge request reports

Loading