diff --git a/@stellar/design-system-website/src/components/Element.tsx b/@stellar/design-system-website/src/components/Element.tsx
index fe77a953..d92c7078 100644
--- a/@stellar/design-system-website/src/components/Element.tsx
+++ b/@stellar/design-system-website/src/components/Element.tsx
@@ -1,14 +1,9 @@
 import React, { Fragment, createElement } from "react";
 import Link from "@docusaurus/Link";
-// import rehypeParse from "rehype-parse";
-// import rehypeReact from "rehype-react";
-// import rehypeSanitize from "rehype-sanitize";
-// import { unified } from "unified";
-
-const rehypeParse = require("rehype-parse");
-const rehypeReact = require("rehype-react");
-const rehypeSanitize = require("rehype-sanitize");
-const { unified } = require("unified");
+import rehypeParse from "rehype-parse";
+import rehypeReact from "rehype-react";
+import rehypeSanitize from "rehype-sanitize";
+import { unified } from "unified";
 
 export type ElementKind = "text" | "code" | "inline-tag";
 
diff --git a/@stellar/design-system/src/components/Button/index.tsx b/@stellar/design-system/src/components/Button/index.tsx
index 11cdd071..2f368878 100644
--- a/@stellar/design-system/src/components/Button/index.tsx
+++ b/@stellar/design-system/src/components/Button/index.tsx
@@ -2,6 +2,9 @@ import React from "react";
 import { Loader } from "../Loader";
 import "./styles.scss";
 
+/**
+ * Including all valid [button attributes](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button#attributes)
+ */
 export interface ButtonProps {
   /** Variant of the button */
   variant:
@@ -30,9 +33,6 @@ export interface ButtonProps {
   /** Button with extra padding */
   isExtraPadding?: boolean;
 }
-/**
- * Including all valid [button attributes](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button#attributes)
- */
 
 interface Props
   extends ButtonProps,
diff --git a/@stellar/design-system/src/components/Link/index.tsx b/@stellar/design-system/src/components/Link/index.tsx
index f3e7c969..de22a065 100644
--- a/@stellar/design-system/src/components/Link/index.tsx
+++ b/@stellar/design-system/src/components/Link/index.tsx
@@ -1,6 +1,9 @@
 import React from "react";
 import "./styles.scss";
 
+/**
+ * Including all valid [anchor element attributes](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/a#attributes)
+ */
 export interface LinkProps {
   /** Content of the link */
   children?: string | React.ReactNode;
@@ -19,9 +22,6 @@ export interface LinkProps {
   /** Make the link uppercase */
   isUppercase?: boolean;
 }
-/**
- * Including all valid [anchor element attributes](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/a#attributes)
- */
 
 interface Props
   extends LinkProps,