Clean up
More javascript improvements