consolidated some lines