one another little refactoring