cleared unnecessary four-clauses, resolved doublecounting