A few refactoring commits #43

Manually merged
tlater merged 3 commits from tlater/refactoring into master 2021-05-17 00:25:32 +01:00

3 commits