Few little refactoring changes...