Refactore Image