fixed amd, removed commonjs