diff --git a/src/components/atoms/SEO.jsx b/src/components/atoms/SEO.jsx
index 97be0d3..cfebeea 100644
--- a/src/components/atoms/SEO.jsx
+++ b/src/components/atoms/SEO.jsx
@@ -26,58 +26,72 @@ const query = graphql`
   }
 `
 
+const MetaTags = ({ title, description, url, image, meta }) => {
+  return (
+    <Helmet
+      defaultTitle={`${meta.title.toLowerCase()} { ${meta.tagline.toLowerCase()} }`}
+      titleTemplate={`%s // ${meta.title.toLowerCase()} { ${meta.tagline.toLowerCase()} }`}
+      title={title}
+    >
+      <html lang="en" />
+
+      {/* General tags */}
+      <meta name="description" content={description} />
+      <meta name="image" content={`${meta.url}${image}`} />
+      <link rel="canonical" href={url} />
+
+      {/* OpenGraph tags */}
+      <meta property="og:url" content={url} />
+      <meta property="og:title" content={title} />
+      <meta property="og:description" content={description} />
+      <meta property="og:image" content={`${meta.url}${image}`} />
+
+      {/* Twitter Card tags */}
+      <meta name="twitter:card" content="summary_large_image" />
+      <meta name="twitter:creator" content={meta.social.Twitter} />
+      <meta name="twitter:title" content={title} />
+      <meta name="twitter:description" content={description} />
+      <meta name="twitter:image" content={`${meta.url}${image}`} />
+    </Helmet>
+  )
+}
+
+MetaTags.propTypes = {
+  title: PropTypes.string,
+  description: PropTypes.string,
+  url: PropTypes.string,
+  image: PropTypes.string,
+  meta: PropTypes.object
+}
+
 export default class SEO extends PureComponent {
   static propTypes = {
     project: PropTypes.object
   }
 
   render() {
-    const { project } = this.props
-
     return (
       <StaticQuery
         query={query}
         render={data => {
+          const { project } = this.props
           const meta = data.dataYaml
-
           const title = (project && project.title) || meta.title
           const description =
-            project && project.fields.excerpt
-              ? project.fields.excerpt
-              : meta.description
+            (project && project.fields.excerpt) || meta.description
           const image =
-            project && project.img
-              ? project.img.childImageSharp.twitterImage.src
-              : meta.img.childImageSharp.resize.src
-          const url =
-            project && project.slug ? `${meta.url}${project.slug}` : meta.url
+            (project && project.img.childImageSharp.twitterImage.src) ||
+            meta.img.childImageSharp.resize.src
+          const url = (project && `${meta.url}${project.slug}`) || meta.url
 
           return (
-            <Helmet
-              defaultTitle={`${meta.title.toLowerCase()} { ${meta.tagline.toLowerCase()} }`}
-              titleTemplate={`%s // ${meta.title.toLowerCase()} { ${meta.tagline.toLowerCase()} }`}
+            <MetaTags
               title={title}
-            >
-              <html lang="en" />
-
-              {/* General tags */}
-              <meta name="description" content={description} />
-              <meta name="image" content={`${meta.url}${image}`} />
-              <link rel="canonical" href={url} />
-
-              {/* OpenGraph tags */}
-              <meta property="og:url" content={url} />
-              <meta property="og:title" content={title} />
-              <meta property="og:description" content={description} />
-              <meta property="og:image" content={`${meta.url}${image}`} />
-
-              {/* Twitter Card tags */}
-              <meta name="twitter:card" content="summary_large_image" />
-              <meta name="twitter:creator" content={meta.social.Twitter} />
-              <meta name="twitter:title" content={title} />
-              <meta name="twitter:description" content={description} />
-              <meta name="twitter:image" content={`${meta.url}${image}`} />
-            </Helmet>
+              description={description}
+              url={url}
+              image={image}
+              meta={meta}
+            />
           )
         }}
       />
