Refactoring with image and details