Simple refactoring #2.