other half of that little refactor