Added fly check, js2-refactor