The great refactor