Improved comment code.