images refactoring
images refactoring