little refactornwqg