A little refactoring for 18 and 67.