Long line cleanup