Improve docblocks

Couple of docblock and linting fixes.
done