little refactor
little refactor