Improved comment code!