more line cleanup