image-manipulator-refactor