Improve comment check