little refactoring..