refactoring #9