Fixed comment matching to stop at EOL