Code commenting improvements