More consistent comments (Span)