A little refactoring.