data-name & dat-role + refactoring