Comments and little refactoring.