Minor refactor for shared image.