little refractoring.