Tweaks to commenting of file