Improves comment tracking