Added a section to get images
Code cleanup