little refactor
getting more faster