First level of cleaning the code. Still need to refactor the code to implement the ImageFetcher class