little refactor to clean things up