JS cleanup
Merge pull request #6 from brennentsmith/master

JS cleanup