refactoring no25