Make it a bit neater.
All we lack now is to make ImageRetriever look nice. I will do that soon.