Refactoring v1 #1

Open
transcaffeine wants to merge 4 commits from transcaffeine/refactor into main

4 Commits