Merge pull request #6 from TheBlueMatt/2022-08-cleanups