tweak PHPDoc comments
tweak var names