Little more refactoring.