simplified some lines