Tidy repo #1

Closed
chris-ashford wants to merge 3 commits from main into main