Attempt to do a little refactoring.