Simplify comment handling