and the great refactor hath commenceth