reformat of doc and comments