I didn't expect refactoring to be such a mentally demanding task, gotta change how I do things, damn