Tidy up overly long lines