Develop

Basic cleaning up code, removed a redundant js file, removed commented out sections, changed `var` declarations to `public` (not sure how this will affect the code)