images/refactoring