Cleaning up and adding the image model