Few little refactors