Cleaned up some lines to make them fit into 80 cols.