A little refactaring.