Miscellaneous commits to add to next

Misc commits to add to next
Nope. We don't always need the image to be a class variable. In this case it is not necessary because we don't use it anywhere else in the class.