tidy up to match original format