comment.js code cleaning and fixing