Reduce var count & clean up comments

-- change one-line comments to proper comment style
-- reduce introduction of new, unnecessary vars
-- reduce overall line count of .js file