renaming image modifier and some cleaning