diff --git a/plop-templates/Component/Component.test.ts.hbs b/plop-templates/Component/Component.test.ts.hbs
index 69b0350..ded95c0 100755
--- a/plop-templates/Component/Component.test.ts.hbs
+++ b/plop-templates/Component/Component.test.ts.hbs
@@ -5,4 +5,4 @@ describe("{{pascalCase name}}", () => {
    it("renders without error", () => {
 
    })
-})
\ No newline at end of file
+})
diff --git a/plop-templates/Component/Component.tsx.hbs b/plop-templates/Component/Component.tsx.hbs
index fc3095d..9790846 100755
--- a/plop-templates/Component/Component.tsx.hbs
+++ b/plop-templates/Component/Component.tsx.hbs
@@ -3,12 +3,8 @@ import "./{{pascalCase name}}.component.scss"
 
 interface {{pascalCase name}}Props {}
 
-const {{pascalCase name}} = props => {
-  return (
-    <div className="c-{{pascalCase name}}">
-      In Component {{pascalCase name}}
-    </div>
-  )
+const {{pascalCase name}} = (props: {{pascalCase name}}Props): JSX.Element => {
+  return <div className="c-{{pascalCase name}}">In Component {{pascalCase name}}</div>
 }
 
-export default {{pascalCase name}}
\ No newline at end of file
+export default {{pascalCase name}}
diff --git a/plop-templates/Component/index.ts.hbs b/plop-templates/Component/index.ts.hbs
index 80f1560..58e2675 100755
--- a/plop-templates/Component/index.ts.hbs
+++ b/plop-templates/Component/index.ts.hbs
@@ -1,3 +1,3 @@
 import {{pascalCase name}} from "./{{pascalCase name}}.jsx"
 
-export default {{pascalCase name}}
\ No newline at end of file
+export default {{pascalCase name}}
diff --git a/plop-templates/Page/Page.test.ts.hbs b/plop-templates/Page/Page.test.ts.hbs
index 69b0350..ded95c0 100755
--- a/plop-templates/Page/Page.test.ts.hbs
+++ b/plop-templates/Page/Page.test.ts.hbs
@@ -5,4 +5,4 @@ describe("{{pascalCase name}}", () => {
    it("renders without error", () => {
 
    })
-})
\ No newline at end of file
+})
diff --git a/plop-templates/Page/Page.tsx.hbs b/plop-templates/Page/Page.tsx.hbs
index d06bee1..a2c2f6a 100755
--- a/plop-templates/Page/Page.tsx.hbs
+++ b/plop-templates/Page/Page.tsx.hbs
@@ -3,12 +3,8 @@ import "./{{pascalCase name}}.module.scss"
 
 interface {{pascalCase name}}Props {}
 
-const {{pascalCase name}} = props => {
-  return (
-    <div className="c-{{pascalCase name}}">
-      In Page {{pascalCase name}}
-    </div>
-  )
+const {{pascalCase name}} = (props: {{pascalCase name}}Props): JSX.Element => {
+  return <div className="c-{{pascalCase name}}">In Page {{pascalCase name}}</div>
 }
 
-export default {{pascalCase name}}
\ No newline at end of file
+export default {{pascalCase name}}
diff --git a/plop-templates/injectable-index.ts.hbs b/plop-templates/injectable-index.ts.hbs
index 6c45966..1b2b859 100755
--- a/plop-templates/injectable-index.ts.hbs
+++ b/plop-templates/injectable-index.ts.hbs
@@ -2,4 +2,4 @@
 
 export {
   /* PLOP_INJECT_EXPORT */
-}
\ No newline at end of file
+}