made little refactering