Some little refactoring things. No major changes.