Refactored code and introduced Computable to retrieve Images