Refactorise the doc