Upaded some more JS stuff to make it fit with the coding styleguide.