Rnou/49 refactor some functions

Merge request reports

Loading