Cleaned up some long lines