mild js 16 refactor