Some general reformatting of line length, etc.