Shortened some lines