Merge pull request #119 from tiger-swallowtails-2014/final_fix

Final fix
took out unnecessary lines
organized js file