Refactor: The mother of all refactors