Simplify comments matching functions