Merge from master into main

Christopher Schmidt requested to merge master into main

code refactor: updated code for better readability and managing, made smaller methods so everything is easier to manage

Merge request reports