Code cleanups
More code cleanups
Some more cleanups in JS Code