Handle comments better