refactor: apply low-effort structural cleanup (items 1, 2, 3, 6) (#20)

refactor: apply low-effort structural cleanup (items 1, 2, 3, 6) (#20) #44