More little refactoring