lick something into shape

and whip something into shape

tv. to put something into good condition, possibly with considerable effort. I’ve got about two days more to lick this place into shape so I can sell it. Whip this manuscript into shape, then we’ll talk about publishing it.