2 files changed, 9 insertions, 8 deletions
diff --git a/src/components/Buttons/Button/Button.tsx b/src/components/Buttons/Button/Button.tsx
index 80acf8d..4d26ea4 100644
--- a/src/components/Buttons/Button/Button.tsx
+++ b/src/components/Buttons/Button/Button.tsx
@@ -15,11 +15,12 @@ const Button = ({
   isDisabled?: boolean;
   isPrimary?: boolean;
 }) => {
-  const classes = `${styles.btn} ${
-    isPrimary
-      ? `${styles.primary} ${styles[`primary--${position}`]}`
-      : `${styles.secondary} ${styles[`secondary--${position}`]}`
-  }`;
+  const primaryPosition = `primary--${position}`;
+  const secondaryPosition = `secondary--${position}`;
+  const typeStyles = isPrimary
+    ? `${styles.primary} ${styles[primaryPosition]}`
+    : `${styles.secondary} ${styles[secondaryPosition]}`;
+  const classes = `${styles.btn} ${typeStyles}`;
 
   return (
     <button
diff --git a/src/components/Buttons/ButtonLink/ButtonLink.tsx b/src/components/Buttons/ButtonLink/ButtonLink.tsx
index a2f75f2..3e78440 100644
--- a/src/components/Buttons/ButtonLink/ButtonLink.tsx
+++ b/src/components/Buttons/ButtonLink/ButtonLink.tsx
@@ -16,9 +16,9 @@ const ButtonLink = ({
   isExternal?: boolean;
   hasIcon?: boolean;
 }) => {
-  const classes = `${styles.btn} ${styles.link} ${styles[`link--${position}`]}${
-    hasIcon ? ` ${styles['link--icon']}` : ''
-  }`;
+  const positionModifier = `link--${position}`;
+  const iconModifier = hasIcon ? ` ${styles['link--icon']}` : '';
+  const classes = `${styles.btn} ${styles.link} ${styles[positionModifier]}${iconModifier}`;
 
   return isExternal ? (
     <a className={classes} href={target}>