Change how image is being saved and looked up and remove extra space.