Reorganized some long lines