Improve docblocks

Couple of docblock and linting fixes.
Did you remove `// Iterator methods...` earlier in this class?