Refactoring

Merged Titus Netland requested to merge refactoring into main

Merge request reports