Refucktoring, hooray!