Refactoring #7