SOme formatting fixes
removed oopsie
jshint stuff and reorganized equation