Improve comment detecting