Fix/Refine document