little refact