refactor, RequireJS added