chore(refactor): harmonize $ attributes