- little refactoring