[CLEANUP] It's cleaning season part 2!

Please look over these changes. I'm not super familiar with the code so I may have broken stuff.
Maybe not?