cleanup a few overlong lines and trailing ws, etc.