Clean up our JS code
Merge branch 'develop'