Refactoring, Part II