JSDoc updates, if statement cleanup