Clean up duplicate identifiers

This also reorders the identifiers in alphabetic order.
Merge pull request #6 from svisser/patch-1

Clean up duplicate identifiers