Images refactoring