brand.id refactoring