+ just refactorings, reduce the require used upfront in master.js, as some only needed by master alone.