refactor some more

Ghost Userrequested to merge
main-refactor into master

closes #17 (closed) i guess 😅

Merge request reports