Refactoring Refactoring Refactoring

Congrats to me. It looks absolutely no different, but I still made some
progress lol.