Refactoring #9