shortened some lines