Refactor Images