Refactoring #2.