Simplify comment parsing