Cleaned up long lines