Refactoring part II