and first refactoring