diff --git a/src/cli.js b/src/cli.js
index e2979d8..33d1d9f 100755
--- a/src/cli.js
+++ b/src/cli.js
@@ -61,9 +61,8 @@ function handleSingleFile(currentOptions, filename) {
         var ext;
         if (currentOptions.modules !== 'typescript') {
             ext = '.js';
-        }
-        else {
-            ext='.ts';
+        } else {
+            ext = '.ts';
         }
         api.convertFile(filename, filename + ext, currentOptions, context);
     } catch (e) {
diff --git a/src/reactTemplates.js b/src/reactTemplates.js
index 04c530f..9722f91 100644
--- a/src/reactTemplates.js
+++ b/src/reactTemplates.js
@@ -26,7 +26,7 @@ var templatePJSTemplate = _.template('var <%= name %> = function () {\n' +
                                 '<%= injectedFunctions %>\n' +
                                 'return <%= body %>\n' +
                                 '};\n');
-var templateTypescriptTemplate = _.template("<%= vars %>\n\n<%= injectedFunctions %>\nvar fn = function() { return <%= body %> };\nexport = fn\n");
+var templateTypescriptTemplate = _.template('<%= vars %>\n\n<%= injectedFunctions %>\nvar fn = function() { return <%= body %> };\nexport = fn\n');
 var htmlSelfClosingTags = ['area', 'base', 'br', 'col', 'command', 'embed', 'hr', 'img', 'input', 'keygen', 'link', 'meta', 'param', 'source', 'track', 'wbr'];
 
 var templateProp = 'rt-repeat';
@@ -352,14 +352,12 @@ function convertTemplateToReact(html, options) {
                 throw RTCodeError.build("rt-require needs 'dependency' and 'as' attributes", context, tag);
             } else if (tag.children.length) {
                 throw RTCodeError.build('rt-require may have no children', context, tag);
-            } else {
-                if (options.modules !== 'typescript') {
-                    defines[tag.attribs.dependency] = tag.attribs.as;
-                }
-                else {
-                    defines['./'+tag.attribs.dependency] = tag.attribs.as;
-                }
             }
+            //if (options.modules === 'typescript') {
+            //    defines['./' + tag.attribs.dependency] = tag.attribs.as;
+            //} else {
+            defines[tag.attribs.dependency] = tag.attribs.as;
+            //}
         } else if (firstTag === null) {
             firstTag = tag;
         } else {
@@ -373,23 +371,21 @@ function convertTemplateToReact(html, options) {
     var requirePaths = _(defines).keys().map(function (reqName) { return '"' + reqName + '"'; }).value().join(',');
     var requireVars = _(defines).values().value().join(',');
     var vars;
-    if (options.modules !== 'typescript') {
-        vars = _(defines).map(function (reqVar, reqPath) { return 'var ' + reqVar + " = require('" + reqPath + "');"; }).join('\n');
-    }
-    else {
+    if (options.modules === 'typescript') {
         vars = _(defines).map(function (reqVar, reqPath) { return 'import ' + reqVar + " = require('" + reqPath + "');"; }).join('\n');
+    } else {
+        vars = _(defines).map(function (reqVar, reqPath) { return 'var ' + reqVar + " = require('" + reqPath + "');"; }).join('\n');
     }
     var data = {body: body, injectedFunctions: '', requireNames: requireVars, requirePaths: requirePaths, vars: vars, name: options.name};
     data.injectedFunctions = context.injectedFunctions.join('\n');
     var code = generate(data, options);
     if (options.modules !== 'typescript') {
         try {
-            var tree = esprima.parse( code, {range: true, tokens: true, comment: true} );
-            tree = escodegen.attachComments( tree, tree.comments, tree.tokens );
-            code = escodegen.generate( tree, {comment: true} );
-        }
-        catch ( e ) {
-            throw new RTCodeError( e.message, e.index, -1 );
+            var tree = esprima.parse(code, {range: true, tokens: true, comment: true});
+            tree = escodegen.attachComments(tree, tree.comments, tree.tokens);
+            code = escodegen.generate(tree, {comment: true});
+        } catch (e) {
+            throw new RTCodeError(e.message, e.index, -1);
         }
     }
     return code;