Refactors

some refactors for better readability

Merge request reports

Loading