little refactoring...