Shortened some lines to make them <80 characters in length