little refactorings