Refactoring member and documenting