diff --git a/bot.js b/bot.js
index ff7f7ee..d805771 100644
--- a/bot.js
+++ b/bot.js
@@ -264,30 +264,16 @@ client.on('message', message => {
                 break;
             case 'compute':
             case 'convert':
-                if(message.content.substring(10).length > 0)
-                {
-                    var response = calculate(message.content.substring(10));
-                    if(response == "")
-                    {
-                        response = stupidQuestion();
-                    }
-                    message.channel.send(message.author + ' wants to compute: *' + message.content.substring(10) + '*\n' +
-                    'The result is: **' + response + '**')
-                }
-                else
-                {
-                    message.reply(noQuestion());
-                }
-                break;
             case 'calculate':
-                if(message.content.substring(12).length > 0)
+                var message_content = message.content.substring(2).split(' ');
+                if(message_content[1].length > 0)
                 {
-                    var response = calculate(message.content.substring(12));
+                    var response = calculate(message.content.substring(message.content.indexOf(' ')+1));
                     if(response == "")
                     {
                         response = stupidQuestion();
                     }
-                    message.channel.send(message.author + ' wants to compute: *' + message.content.substring(12) + '*\n' +
+                    message.channel.send(message.author + ' wants to compute: *' + message.content.substring(message.content.indexOf(' ')+1) + '*\n' +
                     'The result is: **' + response + '**')
                 }
                 else
@@ -306,12 +292,12 @@ client.on('message', message => {
             case 'dankmemes':
                 message.channel.send((Math.floor(Math.random() * 2) == 0) ? subredditRequest('dankmemes') : imgurRequest('dankmemes', 5));
                 break;
-            /*case 'testcommand':
-                message.channel.send(subredditRequest('Nekomimi', 5));
-                break;*/
             case 'source':
                 message.channel.send("BunnyBot's source code: https://git.dtam.pw/daniel/discord-bot-js");
                 break;
+            /*case 'testcommand':
+                message.channel.send(subredditRequest('Nekomimi', 5));
+                break;*/
 
             // SFW Anime Image commands
             case 'meirl':