Cleaning up code and separating it

Merge request reports

Loading