clean up some lines
clean up some more