diff --git a/src/languages/fsharp.js b/src/languages/fsharp.js
index b730ab2..cc3ccc2 100644
--- a/src/languages/fsharp.js
+++ b/src/languages/fsharp.js
@@ -3,8 +3,7 @@ const Language = require('../struct/Language');
 class FSharp extends Language {
     constructor() {
         super('fsharp', {
-            highlight: 'fs',
-            aliases: ['fsharp', 'f#', 'fs']
+            aliases: ['fsharp', 'fs']
         });
     }
 }
diff --git a/src/languages/go.js b/src/languages/go.js
index f8c8d4d..34427bf 100644
--- a/src/languages/go.js
+++ b/src/languages/go.js
@@ -3,8 +3,7 @@ const Language = require('../struct/Language');
 class Go extends Language {
     constructor() {
         super('go', {
-            highlight: 'go',
-            aliases: ['go']
+            aliases: ['golang', 'go']
         });
     }
 }
diff --git a/src/languages/haskell.js b/src/languages/haskell.js
index d886fdb..ceeb7e3 100644
--- a/src/languages/haskell.js
+++ b/src/languages/haskell.js
@@ -3,7 +3,6 @@ const Language = require('../struct/Language');
 class Haskell extends Language {
     constructor() {
         super('haskell', {
-            highlight: 'hs',
             aliases: ['haskell', 'hs'],
             options: {
                 e: () => ''
diff --git a/src/languages/javascript.js b/src/languages/javascript.js
index 7fbb032..a88558d 100644
--- a/src/languages/javascript.js
+++ b/src/languages/javascript.js
@@ -3,7 +3,6 @@ const Language = require('../struct/Language');
 class JavaScript extends Language {
     constructor() {
         super('javascript', {
-            highlight: 'js',
             aliases: ['javascript', 'js'],
             options: {
                 harmony: () => '',
diff --git a/src/languages/pascal.js b/src/languages/pascal.js
index 6aca115..f4969c4 100644
--- a/src/languages/pascal.js
+++ b/src/languages/pascal.js
@@ -3,8 +3,7 @@ const Language = require('../struct/Language');
 class Pascal extends Language {
     constructor() {
         super('pascal', {
-            highlight: 'pas',
-            aliases: ['pascal', 'pas']
+            aliases: ['pascal', 'pas', 'freepascal']
         });
     }
 }
diff --git a/src/languages/python.js b/src/languages/python.js
index 37e33c8..cb68687 100644
--- a/src/languages/python.js
+++ b/src/languages/python.js
@@ -3,7 +3,6 @@ const Language = require('../struct/Language');
 class Python extends Language {
     constructor() {
         super('python', {
-            highlight: 'py',
             aliases: ['python', 'py'],
             loads: ['python3', 'python2'],
             options: {
diff --git a/src/listeners/messageInvalid.js b/src/listeners/messageInvalid.js
index 7ccc62c..cfa5b36 100644
--- a/src/listeners/messageInvalid.js
+++ b/src/listeners/messageInvalid.js
@@ -45,7 +45,7 @@ class MessageInvalidListener extends Listener {
         }
 
         const invalid = parse.invalid.length ? `Invalid options: ${parse.invalid.join(', ')}\n` : '';
-        const output = `${invalid}\`\`\`${parse.language.highlight}\n${result}\`\`\``;
+        const output = `${invalid}\`\`\`${parse.language.aliases[0]}\n${result}\`\`\``;
         if (output.length >= 2000) {
             const key = await fetch('https://hastebin.com/documents', { method: 'POST', body: result })
                 .then(res => res.json())
diff --git a/src/struct/Language.js b/src/struct/Language.js
index cb22ca7..760d403 100644
--- a/src/struct/Language.js
+++ b/src/struct/Language.js
@@ -3,14 +3,12 @@ const { AkairoModule } = require('discord-akairo');
 class Language extends AkairoModule {
     constructor(id, {
         category,
-        highlight,
         aliases,
         loads = [id],
         options = {}
     } = {}) {
         super(id, { category });
 
-        this.highlight = highlight;
         this.aliases = aliases;
         this.loads = loads;
         this.options = options;