Cleaned up some names and initialized data-attr defined cloning