brand_images refactoring