Tidy up scaling