Cleanup code pass#104

BillyDM merged 2 commits intoBillyDM:mainBillyDM/Firewheel:mainfrom

atlv24:ad/code-cleanupatlv24/Firewheel:ad/code-cleanupCopy head branch name to clipboard