Fixed: Handle attributes with "-" in their name
Fixed: Remove unused imports
Fixed: Add new namespace

Used in TEI, doesn't hurt to have it here too.
Fixed: remove unused imports
Code Style updates