Slight JS cleanup