More js cleanup for #80