A smaller PR from scrutinizer with good advices on doc