[minor] Removing unneeded circular reference
[minor] Fixing JSDoc comments
[minor] Removing redundant checks