Refactored the images