Match comments better