cleanup and added todos for image list