Ouff little refactoring