cleaned up some lines