JS cleaning
JS cleaning
JS cleaning
Merge pull request #1 from timwright12/master

JS cleaning