little refactoring 2