clean up javascript
Merge pull request #64 from mergeconflict/mergeconflict/js-bikeshedding

clean up javascript