Minor editing
* Use of generic Jquery(jq)
* variable correction
* organize imports