Image refactor