Merge reviewed and cleaned code into master

Merge reviewed and cleaned code into master

Merge request reports

Loading