refactoring 26