REV: Improved code structure.
ADD: Added comment count js.