All files now < 80 in line length