Comment folding refined