little refactoring.