Refactor: Remove self.images so they aren't stored twice.