little refactoring
minimal changes