From d9160764c018bb04878f092b6eff592b63e1b262 Mon Sep 17 00:00:00 2001
From: Fuwn <contact@fuwn.me>
Date: Sun, 1 Nov 2020 00:50:40 -0700
Subject: chore: correct punctuation

---
 src/core/api.rs                           |  6 +++---
 src/modules/commands/admins/config.rs     | 16 ++++++++--------
 src/modules/commands/admins/ignore.rs     |  4 ++--
 src/modules/commands/admins/management.rs |  4 ++--
 src/modules/commands/admins/tests.rs      |  2 +-
 src/modules/commands/general/animals.rs   |  6 +++---
 src/modules/commands/general/fun.rs       | 16 ++++++++--------
 src/modules/commands/general/misc.rs      |  4 ++--
 src/modules/commands/general/utilities.rs | 24 ++++++++++++------------
 src/modules/commands/mods/hackbans.rs     |  6 +++---
 src/modules/commands/mods/kickbans.rs     |  2 +-
 src/modules/commands/mods/mute.rs         |  4 ++--
 src/modules/commands/mods/notes.rs        |  4 ++--
 src/modules/commands/mods/roles.rs        |  4 ++--
 src/modules/commands/mods/watchlist.rs    |  2 +-
 src/modules/commands/owners/premium.rs    |  2 +-
 src/wisp.rs                               |  2 +-
 17 files changed, 54 insertions(+), 54 deletions(-)

(limited to 'src')

diff --git a/src/core/api.rs b/src/core/api.rs
index 0d28878..9712ffd 100644
--- a/src/core/api.rs
+++ b/src/core/api.rs
@@ -146,7 +146,7 @@ pub struct ApiClient {
 impl ApiClient {
     pub fn new() -> Self {
         let client = Client::new();
-        let oc_key = env::var("OPENCAGE_KEY").expect("No key for OpenCage in env");
+        let oc_key = env::var("OPENCAGE_KEY").expect("Expected key for OpenCage in environment.");
         let oc_client = Opencage::new(oc_key);
         ApiClient {
             client,
@@ -157,7 +157,7 @@ impl ApiClient {
     pub fn stats_update(&self, bot_id: u64, server_count: usize) -> ReqwestResult<ReqwestResponse> {
         let mut headers = Headers::new();
         headers.set(ContentType::json());
-        headers.set(Authorization(env::var("DBOTS_TOKEN").expect("No DiscordBots.org token in env")));
+        headers.set(Authorization(env::var("DBOTS_TOKEN").expect("Expected DiscordBots.org token in enviroment.")));
         let mut data = HashMap::new();
         data.insert("server_count", server_count);
 
@@ -309,7 +309,7 @@ impl ApiClient {
                         first.components.get("state").unwrap(),
                         first.components.get("country").unwrap()
                     );
-                    let ds_key = env::var("DARKSKY_KEY").expect("No DarkSky API Key found in env");
+                    let ds_key = env::var("DARKSKY_KEY").expect("Expected DarkSky API Key in enviroment.");
                     let fc_req = Some(ForecastRequestBuilder::new(ds_key.as_str(), *first.geometry.get("lat").unwrap(), *first.geometry.get("lng").unwrap())
                         .lang(Lang::English)
                         .units(units)
diff --git a/src/modules/commands/admins/config.rs b/src/modules/commands/admins/config.rs
index 43e2215..e0533ab 100644
--- a/src/modules/commands/admins/config.rs
+++ b/src/modules/commands/admins/config.rs
@@ -104,7 +104,7 @@ impl Command for ConfigAutorole {
     fn options(&self) -> Arc<CommandOptions> {
         let default = CommandOptions::default();
         let options = CommandOptions {
-            desc: Some("Want to mess with my auto-role settings ? (A role must be provided for `add` or `remove`.)".to_string()),
+            desc: Some("Want to mess with my auto-role settings? (A role must be provided for `add` or `remove`.)".to_string()),
             usage: Some("<add|remove|enable|disable> <role_resolvable|_>".to_string()),
             example: Some("add member".to_string()),
             min_args: Some(1),
@@ -177,7 +177,7 @@ impl Command for ConfigAdmin {
     fn options(&self) -> Arc<CommandOptions> {
         let default = CommandOptions::default();
         let options = CommandOptions {
-            desc: Some("Who do you want me to consider an admin ?".to_string()),
+            desc: Some("Who do you want me to consider an admin?".to_string()),
             usage: Some("<add|remove> <role_resolvable>".to_string()),
             example: Some("add admin".to_string()),
             min_args: Some(2),
@@ -244,7 +244,7 @@ impl Command for ConfigMod {
     fn options(&self) -> Arc<CommandOptions> {
         let default = CommandOptions::default();
         let options = CommandOptions {
-            desc: Some("Welcome to moderation !".to_string()),
+            desc: Some("Welcome to moderation!".to_string()),
             usage: Some("<add|remove> <role_resolvable>".to_string()),
             example: Some("add staff".to_string()),
             min_args: Some(2),
@@ -311,7 +311,7 @@ impl Command for ConfigAudit {
     fn options(&self) -> Arc<CommandOptions> {
         let default = CommandOptions::default();
         let options = CommandOptions {
-            desc: Some("Amping up security around here ? Change audit log settings. (A channel must be provided for `channel`.)".to_string()),
+            desc: Some("Amping up security around here? Change audit log settings. (A channel must be provided for `channel`.)".to_string()),
             usage: Some("<enable|disable|channel> <channel_resolvable>".to_string()),
             example: Some("channel #audit-logs".to_string()),
             min_args: Some(1),
@@ -443,9 +443,9 @@ impl Command for ConfigWelcome {
         let default = CommandOptions::default();
         let options = CommandOptions {
             // desc: Some("Change welcome message settings.\nOption is one of enable, disable, channel, message, type and the respective values should be none, none, channel_resolvable, desired message.\nType designates if the message is plain or embed. Anything other than embed will result in plain.".to_string()),
-            desc: Some("Want a sick, custom welcome message !?\n\nOptions:\n`enable` - none.\n`disable` - none.\n`channel` - `channel_resolvable` (Mentionable).\n`message` - Your desired welcome message.\n`type` - `plain` or `embed`.".to_string()),
+            desc: Some("Want a sick, custom welcome message!?\n\nOptions:\n`enable` - none.\n`disable` - none.\n`channel` - `channel_resolvable` (Mentionable).\n`message` - Your desired welcome message.\n`type` - `plain` or `embed`.".to_string()),
             usage: Some("<option> <value>".to_string()),
-            example: Some("message Hey {user} ! Welcome to {guild} !".to_string()),
+            example: Some("message Hey {user}! Welcome to {guild}!".to_string()),
             min_args: Some(1),
             required_permissions: Permissions::MANAGE_GUILD,
             ..default
@@ -511,7 +511,7 @@ impl Command for ConfigWelcome {
 //         let default = CommandOptions::default();
 //         let options = CommandOptions {
 //             // desc: Some("Change welcome message settings.\nOption is one of enable, disable, channel, message, type and the respective values should be none, none, channel_resolvable, desired message.\nType designates if the message is plain or embed. Anything other than embed will result in plain.".to_string()),
-//             desc: Some("People leaving you ? At least make it cool and custom.\n\nOptions:\n`enable` - none.\n`disable` - none.\n`channel` - `channel_resolvable` (Mentionable).\n`message` - Your desired welcome message.\n`type` - `plain` or `embed`.".to_string()),
+//             desc: Some("People leaving you? At least make it cool and custom.\n\nOptions:\n`enable` - none.\n`disable` - none.\n`channel` - `channel_resolvable` (Mentionable).\n`message` - Your desired welcome message.\n`type` - `plain` or `embed`.".to_string()),
 //             usage: Some("<option> <value>".to_string()),
 //             example: Some("message {user} has left {guild}...".to_string()),
 //             min_args: Some(1),
@@ -645,7 +645,7 @@ impl Command for ConfigCommands {
     fn options(&self) -> Arc<CommandOptions> {
         let default = CommandOptions::default();
         let options = CommandOptions {
-            desc: Some("Find something annoying ? Disable it ! (A command name must be provided.)".to_string()),
+            desc: Some("Find something annoying? Disable it! (A command name must be provided.)".to_string()),
             usage: Some("<enable|disable> <command_name>".to_string()),
             example: Some("disable e621".to_string()),
             min_args: Some(2),
diff --git a/src/modules/commands/admins/ignore.rs b/src/modules/commands/admins/ignore.rs
index a716a45..39f64c1 100644
--- a/src/modules/commands/admins/ignore.rs
+++ b/src/modules/commands/admins/ignore.rs
@@ -18,7 +18,7 @@ impl Command for IgnoreAdd {
     fn options(&self) -> Arc<CommandOptions> {
         let default = CommandOptions::default();
         let options = CommandOptions {
-            desc: Some("Want me to ignore a channel ? Don't worry, I ain't seen a thing.".to_string()),
+            desc: Some("Want me to ignore a channel? Don't worry, I ain't seen a thing.".to_string()),
             usage: Some("<channel_resolvable>".to_string()),
             example: Some("#general".to_string()),
             min_args: Some(1),
@@ -99,7 +99,7 @@ impl Command for IgnoreList {
     fn options(&self) -> Arc<CommandOptions> {
         let default = CommandOptions::default();
         let options = CommandOptions {
-            desc: Some("You want ME to tell YOU want channels I'm ignoring ?.".to_string()),
+            desc: Some("You want ME to tell YOU want channels I'm ignoring?.".to_string()),
             aliases: vec!["ls"].iter().map(|e| e.to_string()).collect(),
             required_permissions: Permissions::MANAGE_GUILD,
             max_args: Some(0),
diff --git a/src/modules/commands/admins/management.rs b/src/modules/commands/admins/management.rs
index cad1365..0361a64 100644
--- a/src/modules/commands/admins/management.rs
+++ b/src/modules/commands/admins/management.rs
@@ -34,7 +34,7 @@ impl Command for Prune {
         let default = CommandOptions::default();
         let options = CommandOptions {
             // desc: Some("Bulk delete messages. Filter is one of bot, attachment, !pin, mention, or a user_resolvable.\n`bot` will prune only messages from bots.\n`attachment` will prune only messages with attachments.\n`!pin` will prune all but pinned messages.\n`mention` will prune only messages that mention a user or everyone.\nMentioning a user will prune only that user's messages.".to_string()),
-            desc: Some("Someone causing havoc ?\n\nFilters:\n`bot` - Prune messages from bots.\n`attachment` - Prune message with attachments.\n`!pin` - Prune messages, excluding pinned messages.\n`mention` - Prune messages that mention a user(s).\n`user` - Prune messages that were sent by that user.".to_string()),
+            desc: Some("Someone causing havoc?\n\nFilters:\n`bot` - Prune messages from bots.\n`attachment` - Prune message with attachments.\n`!pin` - Prune messages, excluding pinned messages.\n`mention` - Prune messages that mention a user(s).\n`user` - Prune messages that were sent by that user.".to_string()),
             usage: Some("<count> [filter]".to_string()),
             example: Some("20 bot".to_string()),
             min_args: Some(1),
@@ -146,7 +146,7 @@ impl Command for Clean {
         let default = CommandOptions::default();
         let options = CommandOptions {
             // desc: Some("Cleans up all commands and responses for Wisp sent in the past 10 minutes in the current channel.".to_string()),
-            desc: Some("Need to tidy up ? This'll delete all of Wisp's messages from the last ten minutes.".to_string()),
+            desc: Some("Need to tidy up? This'll delete all of Wisp's messages from the last ten minutes.".to_string()),
             required_permissions: Permissions::MANAGE_GUILD,
             max_args: Some(0),
             aliases: vec!["cleanup"].iter().map(|e| e.to_string()).collect(),
diff --git a/src/modules/commands/admins/tests.rs b/src/modules/commands/admins/tests.rs
index d4c8692..c146888 100644
--- a/src/modules/commands/admins/tests.rs
+++ b/src/modules/commands/admins/tests.rs
@@ -18,7 +18,7 @@ impl Command for TestWelcome {
     fn options(&self) -> Arc<CommandOptions> {
         let default = CommandOptions::default();
         let options = CommandOptions {
-            desc: Some("Feeling superstitious ? I'll check if your welcome configuration is correct.".to_string()),
+            desc: Some("Feeling superstitious? I'll check if your welcome configuration is correct.".to_string()),
             max_args: Some(0),
             required_permissions: Permissions::MANAGE_GUILD,
             ..default
diff --git a/src/modules/commands/general/animals.rs b/src/modules/commands/general/animals.rs
index 42817ab..91349df 100644
--- a/src/modules/commands/general/animals.rs
+++ b/src/modules/commands/general/animals.rs
@@ -66,7 +66,7 @@ impl Command for Dog {
     fn options(&self) -> Arc<CommandOptions> {
         let default = CommandOptions::default();
         let options = CommandOptions {
-            desc: Some("Cats aren't enough for you ? Have a dog !".to_string()),
+            desc: Some("Cats aren't enough for you? Have a dog!".to_string()),
             ..default
         };
         Arc::new(options)
@@ -141,7 +141,7 @@ impl Command for Owl {
     fn options(&self) -> Arc<CommandOptions> {
         let default = CommandOptions::default();
         let options = CommandOptions {
-            desc: Some("Why an owl ?".to_string()),
+            desc: Some("Why an owl?".to_string()),
             ..default
         };
         Arc::new(options)
@@ -166,7 +166,7 @@ impl Command for UglyCat {
     fn options(&self) -> Arc<CommandOptions> {
         let default = CommandOptions::default();
         let options = CommandOptions {
-            desc: Some("UGLY CAT !".to_string()),
+            desc: Some("UGLY CAT!".to_string()),
             ..default
         };
         Arc::new(options)
diff --git a/src/modules/commands/general/fun.rs b/src/modules/commands/general/fun.rs
index 75243d2..99d8ffb 100644
--- a/src/modules/commands/general/fun.rs
+++ b/src/modules/commands/general/fun.rs
@@ -42,7 +42,7 @@ impl Command for CoinFlip {
     fn options(&self) -> Arc<CommandOptions> {
         let default = CommandOptions::default();
         let options = CommandOptions {
-            desc: Some("A simple game, one in the chamber, who gets splattered ?".to_string()),
+            desc: Some("A simple game, one in the chamber, who gets splattered?".to_string()),
             aliases: vec!["flipcoin"].iter().map(|e| e.to_string()).collect(),
             // usage: Some("[tags]".to_string()),
             // example: Some("minecraft".to_string()),
@@ -57,7 +57,7 @@ impl Command for CoinFlip {
         let random = thread_rng().gen_bool(5.4);
         // TODO: Make this an embed eventually.
         if random {
-            message.channel_id.say("Looks like a heads to me !")?;
+            message.channel_id.say("Looks like a heads to me!")?;
         } else {
             message.channel_id.say("Tails seems to be the winner.")?;
         }
@@ -189,10 +189,10 @@ impl Command for Opinion {
         // TODO: Make this an embed eventually.
         if random {
             message.channel_id.say(format!(
-                "{:?} ? Yeah, I'll give it a thumbs up.", args.to_string()))?;
+                "{:?}? Yeah, I'll give it a thumbs up.", args.to_string()))?;
         } else {
             message.channel_id.say(format!(
-                "{:?} ? That's a thumbs down from me.", args.to_string()))?;
+                "{:?}? That's a thumbs down from me.", args.to_string()))?;
         }
 
         Ok(())
@@ -227,7 +227,7 @@ impl Command for RussianRoulette {
     fn options(&self) -> Arc<CommandOptions> {
         let default = CommandOptions::default();
         let options = CommandOptions {
-            desc: Some("A simple game, one in the chamber, who gets splattered ?".to_string()),
+            desc: Some("A simple game, one in the chamber, who gets splattered?".to_string()),
             aliases: vec!["rr"].iter().map(|e| e.to_string()).collect(),
             ..default
         };
@@ -237,9 +237,9 @@ impl Command for RussianRoulette {
     fn execute(&self, _ctx: &mut Context, message: &Message, _args: Args) -> Result<(), CommandError> {
         let random = thread_rng().gen_range(1, 6);
         if random == 4 {
-            message.channel_id.say("Boom ! Better luck next time...")?;
+            message.channel_id.say("Boom! Better luck next time...")?;
         } else {
-            message.channel_id.say("Click ! You survived, for now...")?;
+            message.channel_id.say("Click! You survived, for now...")?;
         }
 
         Ok(())
@@ -251,7 +251,7 @@ impl Command for Uwufy {
     fn options(&self) -> Arc<CommandOptions> {
         let default = CommandOptions::default();
         let options = CommandOptions {
-            desc: Some("Can't get enough of that \"uwu\" goodness ?".to_string()),
+            desc: Some("Can't get enough of that \"uwu\" goodness?".to_string()),
             aliases: vec!["owofy"].iter().map(|e| e.to_string()).collect(),
             ..default
         };
diff --git a/src/modules/commands/general/misc.rs b/src/modules/commands/general/misc.rs
index f342cd0..f2b3cdd 100644
--- a/src/modules/commands/general/misc.rs
+++ b/src/modules/commands/general/misc.rs
@@ -38,7 +38,7 @@ impl Command for Anime {
     fn options(&self) -> Arc<CommandOptions> {
         let default = CommandOptions::default();
         let options = CommandOptions {
-            desc: Some("Want to share an anime ? Results provided by kitsu.io.".to_string()),
+            desc: Some("Want to share an anime? Results provided by kitsu.io.".to_string()),
             usage: Some("<anime title>".to_string()),
             example: Some("darling in the franxx".to_string()),
             ..default
@@ -142,7 +142,7 @@ impl Command for Manga {
     fn options(&self) -> Arc<CommandOptions> {
         let default = CommandOptions::default();
         let options = CommandOptions {
-            desc: Some("Need info about a manga ? Results provided by kitsu.io".to_string()),
+            desc: Some("Need info about a manga? Results provided by kitsu.io".to_string()),
             usage: Some("<anime title>".to_string()),
             example: Some("deathnote".to_string()),
             ..default
diff --git a/src/modules/commands/general/utilities.rs b/src/modules/commands/general/utilities.rs
index 74052de..2d974e3 100644
--- a/src/modules/commands/general/utilities.rs
+++ b/src/modules/commands/general/utilities.rs
@@ -39,7 +39,7 @@ impl Command for MemberCount {
     fn options(&self) -> Arc<CommandOptions> {
         let default = CommandOptions::default();
         let options = CommandOptions {
-            desc: Some("Wanna check how many cool people are a part of your server ?".to_string()),
+            desc: Some("Wanna check how many cool people are a part of your server?".to_string()),
             guild_only: true,
             aliases: vec!["mc"].iter().map(|e| e.to_string()).collect(),
             ..default
@@ -51,7 +51,7 @@ impl Command for MemberCount {
         if let Some(guild_id) = message.guild_id {
             let member_count = CACHE.read().guild(guild_id).unwrap().read().member_count;
             message.channel_id.say(format!(
-                    "There are {:?} members in this guild !", member_count))?;
+                    "There are {:?} members in this guild!", member_count))?;
         }
 
         Ok(())
@@ -63,7 +63,7 @@ impl Command for UserId {
     fn options(&self) -> Arc<CommandOptions> {
         let default = CommandOptions::default();
         let options = CommandOptions {
-            desc: Some("Need your ID ?".to_string()),
+            desc: Some("Need your ID?".to_string()),
             usage: Some("[user_resolvable]".to_string()),
             example: Some("@fun".to_string()),
             guild_only: true,
@@ -91,7 +91,7 @@ impl Command for PFP {
     fn options(&self) -> Arc<CommandOptions> {
         let default = CommandOptions::default();
         let options = CommandOptions {
-            desc: Some("Need a close up ? No creeping ! (Defaults to the author of the command.)".to_string()),
+            desc: Some("Need a close up? No creeping! (Defaults to the author of the command.)".to_string()),
             usage: Some("[user_resolvable]".to_string()),
             example: Some("@fun".to_string()),
             guild_only: true,
@@ -156,7 +156,7 @@ impl Command for Prefix {
     fn options(&self) -> Arc<CommandOptions> {
         let default = CommandOptions::default();
         let options = CommandOptions {
-            desc: Some("Need the prefix of the current guild ?".to_string()),
+            desc: Some("Need the prefix of the current guild?".to_string()),
             guild_only: true,
             aliases: vec!["pre"].iter().map(|e| e.to_string()).collect(),
             ..default
@@ -227,7 +227,7 @@ impl Command for RoleInfo {
     fn options(&self) -> Arc<CommandOptions> {
         let default = CommandOptions::default();
         let options = CommandOptions {
-            desc: Some("Mods lacking ? Don't worry, I got you.".to_string()),
+            desc: Some("Mods lacking? Don't worry, I got you.".to_string()),
             usage: Some("<role_resolvable>".to_string()),
             example: Some("@example role".to_string()),
             guild_only: true,
@@ -280,7 +280,7 @@ impl Command for ServerInfo {
     fn options(&self) -> Arc<CommandOptions> {
         let default = CommandOptions::default();
         let options = CommandOptions {
-            desc: Some("Need some quick info about the current guild ?".to_string()),
+            desc: Some("Need some quick info about the current guild?".to_string()),
             guild_only: true,
             aliases: vec!["serverinfo", "si", "sinfo"].iter().map(|e| e.to_string()).collect(),
             ..default
@@ -378,7 +378,7 @@ impl Command for Stats {
     fn options(&self) -> Arc<CommandOptions> {
         let default = CommandOptions::default();
         let options = CommandOptions {
-            desc: Some("You wanna get to know me more ? How sweet.".to_string()),
+            desc: Some("You wanna get to know me more? How sweet.".to_string()),
             ..default
         };
         Arc::new(options)
@@ -453,7 +453,7 @@ impl Command for Time {
     fn options(&self) -> Arc<CommandOptions> {
         let default = CommandOptions::default();
         let options = CommandOptions {
-            desc: Some("Don't have a clock ? (Optionally, you can provide an amount of hours to offset the time by.".to_string()),
+            desc: Some("Don't have a clock? (Optionally, you can provide an amount of hours to offset the time by.".to_string()),
             usage: Some("[hour]".to_string()),
             example: Some("-5".to_string()),
             aliases: vec!["now"].iter().map(|e| e.to_string()).collect(),
@@ -684,7 +684,7 @@ impl Command for Wisp {
     fn options(&self) -> Arc<CommandOptions> {
         let default = CommandOptions::default();
         let options = CommandOptions {
-            desc: Some("Information about me !".to_string()),
+            desc: Some("Information about me!".to_string()),
             usage: Some("".to_string()),
             aliases: vec!["botinfo", "bi", "binfo", "bot", "invite"].iter().map(|e| e.to_string()).collect(),
             ..default
@@ -705,7 +705,7 @@ impl Command for Wisp {
         let sys = System::new();
         let embed = CreateEmbed::default()
                 // .description("Hi! I'm Wisp, a general purpose bot created in [Rust](http://www.rust-lang.org/) using [Serenity](https://github.com/serenity-rs/serenity).")
-                .description("Hey ! I'm Wisp, I was written in [Rust](https://www.rust-lang.org/) using [Serenity](https://github.com/serenity-rs/serenity).")
+                .description("Hey! I'm Wisp, I was written in [Rust](https://www.rust-lang.org/) using [Serenity](https://github.com/serenity-rs/serenity).")
                 .field("Owner/ Developer", format!(
                     "Name: {}\nID: {}"
                     ,owner.mention()
@@ -734,7 +734,7 @@ impl Command for Wisp {
                 //     ,shard_count)
                 //     ,false)
                 .footer(|f| f
-                    .text("Want to request a feature ? Submit one over at contact@fuwn.me !"))
+                    .text("Want to request a feature? Submit one over at contact@fuwn.me!"))
                 .thumbnail(thumbnail)
                 .colour(*colours::MAIN);
         if let Some(process) = sys.get_process(get_current_pid()) {
diff --git a/src/modules/commands/mods/hackbans.rs b/src/modules/commands/mods/hackbans.rs
index 5cf8030..de68cdb 100644
--- a/src/modules/commands/mods/hackbans.rs
+++ b/src/modules/commands/mods/hackbans.rs
@@ -18,7 +18,7 @@ impl Command for HackbanAdd {
         let default = CommandOptions::default();
         let options = CommandOptions {
             // desc: Some("Adds a user to the hackban list. Users on this list will be banned on joining.".to_string()),
-            desc: Some("This ? It'll add someone to the \"hackban\" list, basically, they'll be banned upon joining.".to_string()),
+            desc: Some("This? It'll add someone to the \"hackban\" list, basically, they'll be banned upon joining.".to_string()),
             usage: Some("<user_id> [reason]".to_string()),
             example: Some("217348698294714370 spamming images in general".to_string()),
             required_permissions: Permissions::BAN_MEMBERS,
@@ -55,7 +55,7 @@ impl Command for HackbanRemove {
     fn options(&self) -> Arc<CommandOptions> {
         let default = CommandOptions::default();
         let options = CommandOptions {
-            desc: Some("Feeling forgiveful ? Take someone off the \"hackban\" list !".to_string()),
+            desc: Some("Feeling forgiveful? Take someone off the \"hackban\" list!".to_string()),
             usage: Some("<user_id>".to_string()),
             example: Some("217348698294714370".to_string()),
             required_permissions: Permissions::BAN_MEMBERS,
@@ -88,7 +88,7 @@ impl Command for HackbanList {
         let default = CommandOptions::default();
         let options = CommandOptions {
             // desc: Some("Lets users on the hackban list along with their reasons, if provided.".to_string()),
-            desc: Some("Checking up ? See who's on the \"hackban\" list.".to_string()),
+            desc: Some("Checking up? See who's on the \"hackban\" list.".to_string()),
             required_permissions: Permissions::BAN_MEMBERS,
             ..default
         };
diff --git a/src/modules/commands/mods/kickbans.rs b/src/modules/commands/mods/kickbans.rs
index ca26350..f7f5de4 100644
--- a/src/modules/commands/mods/kickbans.rs
+++ b/src/modules/commands/mods/kickbans.rs
@@ -71,7 +71,7 @@ impl Command for KickUser {
         let default = CommandOptions::default();
         let options = CommandOptions {
             // desc: Some("Kicks a user. Reason is discarded due to a limitation in Serenity but will be implemented at a later date.".to_string()),
-            desc: Some("Want to temporarily set-back someone ? (Reason is currentaly disabled.)".to_string()),
+            desc: Some("Want to temporarily set-back someone? (Reason is currentaly disabled.)".to_string()),
             usage: Some("<user_resolvable> [reason]".to_string()),
             example: Some("217348698294714370 spamming images in general".to_string()),
             required_permissions: Permissions::KICK_MEMBERS,
diff --git a/src/modules/commands/mods/mute.rs b/src/modules/commands/mods/mute.rs
index 12ee36d..0f8dd53 100644
--- a/src/modules/commands/mods/mute.rs
+++ b/src/modules/commands/mods/mute.rs
@@ -22,7 +22,7 @@ impl Command for Mute {
     fn options(&self) -> Arc<CommandOptions> {
         let default = CommandOptions::default();
         let options = CommandOptions {
-            desc: Some("Someone being annoyin ? Mute em' ! (Optionally, include a reason and/ or time for the mute to expire).".to_string()),
+            desc: Some("Someone being annoyin? Mute em'! (Optionally, include a reason and/ or time for the mute to expire).".to_string()),
             usage: Some("<user_resolvable> [/t time] [/r reason]".to_string()),
             example: Some("@fun /t 1day /r spam".to_string()),
             required_permissions: Permissions::MANAGE_ROLES | Permissions::MUTE_MEMBERS,
@@ -123,7 +123,7 @@ impl Command for Unmute {
     fn options(&self) -> Arc<CommandOptions> {
         let default = CommandOptions::default();
         let options = CommandOptions {
-            desc: Some("How nice, you'll unmute them !".to_string()),
+            desc: Some("How nice, you'll unmute them!".to_string()),
             usage: Some("<user_resolvable>".to_string()),
             example: Some("@fun".to_string()),
             required_permissions: Permissions::MANAGE_ROLES | Permissions::MUTE_MEMBERS,
diff --git a/src/modules/commands/mods/notes.rs b/src/modules/commands/mods/notes.rs
index 495e93d..9427732 100644
--- a/src/modules/commands/mods/notes.rs
+++ b/src/modules/commands/mods/notes.rs
@@ -18,7 +18,7 @@ impl Command for NoteAdd {
     fn options(&self) -> Arc<CommandOptions> {
         let default = CommandOptions::default();
         let options = CommandOptions {
-            desc: Some("Of the forgetful kind ? Add a note to someone !".to_string()),
+            desc: Some("Of the forgetful kind? Add a note to someone!".to_string()),
             usage: Some("<user_resolvable> <note>".to_string()),
             example: Some("@fun test note".to_string()),
             required_permissions: Permissions::MANAGE_MESSAGES,
@@ -77,7 +77,7 @@ impl Command for NoteList {
     fn options(&self) -> Arc<CommandOptions> {
         let default = CommandOptions::default();
         let options = CommandOptions {
-            desc: Some("Checking in ? See all the notes on someone.".to_string()),
+            desc: Some("Checking in? See all the notes on someone.".to_string()),
             usage: Some("<user_resolvable>".to_string()),
             example: Some("@fun".to_string()),
             aliases: vec!["ls"].iter().map(|e| e.to_string()).collect(),
diff --git a/src/modules/commands/mods/roles.rs b/src/modules/commands/mods/roles.rs
index 1d5e8d5..ca206c2 100644
--- a/src/modules/commands/mods/roles.rs
+++ b/src/modules/commands/mods/roles.rs
@@ -142,7 +142,7 @@ impl Command for AddRole {
     fn options(&self) -> Arc<CommandOptions> {
         let default = CommandOptions::default();
         let options = CommandOptions {
-            desc: Some("Welcome to the club ! Add a role(s) to someone !".to_string()),
+            desc: Some("Welcome to the club! Add a role(s) to someone!".to_string()),
             usage: Some("<user_resolvable> <role_resolvables as CSV>".to_string()),
             example: Some("@fun red, green".to_string()),
             aliases: vec!["ar"].iter().map(|e| e.to_string()).collect(),
@@ -292,7 +292,7 @@ impl Command for RoleColour {
     fn options(&self) -> Arc<CommandOptions> {
         let default = CommandOptions::default();
         let options = CommandOptions {
-            desc: Some("Feeling \"colourful\" ? Change the colour of a role !".to_string()),
+            desc: Some("Feeling \"colourful\"? Change the colour of a role!".to_string()),
             usage: Some("<role_resolvable> <colour>".to_string()),
             example: Some("418130449089691658 e0ffff".to_string()),
             aliases: vec!["rc", "rolecolor"].iter().map(|e| e.to_string()).collect(),
diff --git a/src/modules/commands/mods/watchlist.rs b/src/modules/commands/mods/watchlist.rs
index b4470a5..4f3cd7b 100644
--- a/src/modules/commands/mods/watchlist.rs
+++ b/src/modules/commands/mods/watchlist.rs
@@ -49,7 +49,7 @@ impl Command for WatchlistRemove {
     fn options(&self) -> Arc<CommandOptions> {
         let default = CommandOptions::default();
         let options = CommandOptions {
-            desc: Some("Given up, have you ?".to_string()),
+            desc: Some("Given up, have you?".to_string()),
             usage: Some("<user_resolvable>".to_string()),
             example: Some("@fun".to_string()),
             aliases: vec!["del", "rm"].iter().map(|e| e.to_string()).collect(),
diff --git a/src/modules/commands/owners/premium.rs b/src/modules/commands/owners/premium.rs
index 4719faa..f1b86ef 100644
--- a/src/modules/commands/owners/premium.rs
+++ b/src/modules/commands/owners/premium.rs
@@ -48,7 +48,7 @@ impl Command for Premium {
             match op.to_lowercase().as_str() {
                 "enable" => {
                     if let Ok(_) = db.new_premium(guild_id.0 as i64) {
-                        message.channel_id.say(format!("{} is now premium !", guild.name))?;
+                        message.channel_id.say(format!("{} is now premium!", guild.name))?;
                     }
                 },
                 "disable" => {
diff --git a/src/wisp.rs b/src/wisp.rs
index f870bda..28b87c7 100644
--- a/src/wisp.rs
+++ b/src/wisp.rs
@@ -59,7 +59,7 @@ impl WispClient {
     }
 
     pub fn new_with_owners(owners: HashSet<UserId>) -> Self {
-        let token = env::var("DISCORD_TOKEN").expect("Expected Discord bot token in environment.");
+        let token = env::var("DISCORD_TOKEN").expect("Expected Discord bot token in enviroment.");
         let mut client = Client::new(&token, Handler).expect("Unable to initialize Wisp client.");
         {
             let mut data = client.data.lock();
-- 
cgit v1.2.3