Merge "Improve scale_factors struct"