end of first refactoring