Refactored docu