One more refactoring.