doing a little refactor