A little refactoring, some text spiffying