Refactor and comment

Quick merge to unify my comments with main

Merge request reports

Loading