little refactors