refactory js && helper.
Minor changes.