Changed code so that every line is < 80 in width