1 refactoring