Address remaining long lines