Reordered refactoring tasks