Refactoring and images