Started ECMA Script 6 Refactoring