some long line cleanup