Un-butcher some code