JS cleanup, comments