- little refactor code