JavaScript Cleanups