Should fix counts and remove duplicates, closing #259
Minor update
Reformat for legibility