Finish moving logic from Factory Methods to RequireJS callbacks