Cleanup #17

Merged
kdeng00 merged 2 commits from cleanup into master 2022-08-28 10:53:23 -04:00