Just a few things to make the comments cleaner in the image model