Improved comments, minor regex tweak to avoid replacing single pipes