first little refacto