recormatted some lines that were longer than 80 characters, where possible