Refactoring PartII