Refactoring/doc struct