Another part of refactoring.