refactoring part II