Code Cleanup Part 1#4

abnormalhare wants to merge 4 commits into

owlonpc:mainowlonpc/brainquack:mainfrom

abnormalhare:mainabnormalhare/brainquack:mainCopy head branch name to clipboard