Cleaning up some long lines