More js modernization