Refactored images