Style fixes and fixes to jsdoc comments