Improve comment detection