Fixed comments & fetch clauses