First pass: comments added in text