refactoring /1