first refactoring set