Doc reformat and update