little refactor v2