Reformat and fix rescaling