Improve docblocks

Couple of docblock and linting fixes.
`mixed` is a standard PHP doc block term.