It's refactorin' time, son!