Just a little refactoring.