more requirejs refactor