Refactoring, optimized images