A little refactoring in prep for list work