took out unnecessary lines
organized js file
Merge pull request #120 from tiger-swallowtails-2014/final_fix

Final fix