#813 - PR follow-up

Code / jsdoc cleanup