Update Normalize and tidy up