Commenting code cleaning up