Documentation/comments improvement