Even more image optimization