Rework image transformations