little refactoring ;P