Minor JS cleanup for moving forward