docsaver refact