made little refactoring