A little refactor.