Refactoring, part two