little refacto