diff --git a/modules/utils/getScripts.js b/modules/utils/getScripts.js
index 545700a..2c94a04 100644
--- a/modules/utils/getScripts.js
+++ b/modules/utils/getScripts.js
@@ -5,15 +5,11 @@ import entryManifest from 'entry-manifest';
 import { createElement, createScript } from './markup.js';
 
 function getEntryPoint(name, format) {
-  let entryPoints;
-  entryManifest.forEach(manifest => {
-    if (name in manifest) {
-      entryPoints = manifest[name];
+  for (let manifest of entryManifest) {
+    let bundles = manifest[name];
+    if (bundles) {
+      return bundles.find(b => b.format === format);
     }
-  });
-
-  if (entryPoints) {
-    return entryPoints.find(e => e.format === format);
   }
 
   return null;
@@ -37,6 +33,8 @@ export default function getScripts(entryName, format, globalURLs) {
   if (!entryPoint) return [];
 
   return getGlobalScripts(entryPoint, globalURLs).concat(
+    // Inline the code for this entry point into the page
+    // itself instead of using another <script> tag
     createScript(entryPoint.code)
   );
 }
diff --git a/rollup.config.js b/rollup.config.js
index 8a3eeb3..fa71141 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -12,8 +12,6 @@ const url = require('rollup-plugin-url');
 const entryManifest = require('./plugins/entryManifest');
 const pkg = require('./package.json');
 
-const env = process.env.BUILD_ENV || 'development';
-
 const manifest = entryManifest();
 
 const client = ['browse', 'main'].map(entryName => {
@@ -47,20 +45,20 @@ const client = ['browse', 'main'].map(entryName => {
         }
       }),
       replace({
-        'process.env.NODE_ENV': JSON.stringify(env)
+        'process.env.NODE_ENV': JSON.stringify(
+          process.env.NODE_ENV || 'development'
+        )
       }),
       url({
         limit: 5 * 1024,
         publicPath: '/_client/'
       }),
-      compiler(
-        env !== 'production' ? { formatting: 'PRETTY_PRINT' } : undefined
-      )
+      compiler()
     ]
   };
 });
 
-const dependencies = (env === 'development'
+const dependencies = (process.env.NODE_ENV === 'development'
   ? Object.keys(pkg.dependencies).concat(Object.keys(pkg.devDependencies || {}))
   : Object.keys(pkg.dependencies)
 ).concat('react-dom/server');