Some little refactor