Refactoring files that used ImageLoader