diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/base/ClearChat.java b/src/main/java/wtf/beatrice/hidekobot/commands/base/ClearChat.java
index 92a7a6d..b3844f7 100644
--- a/src/main/java/wtf/beatrice/hidekobot/commands/base/ClearChat.java
+++ b/src/main/java/wtf/beatrice/hidekobot/commands/base/ClearChat.java
@@ -81,11 +81,9 @@ public class ClearChat
             // set how many messages to delete for this iteration (usually <limit> unless there's a remainder)
             int iterationSize = limit;
 
-            // if we are at the last iteration...
-            if(iteration+1 == iterations)
-            {
-                // check if we have <limit> or fewer messages to delete
-                if(remainder != 0) iterationSize = remainder;
+            // if we are at the last iteration... check if we have <limit> or fewer messages to delete
+            if(iteration+1 == iterations && remainder != 0) {
+                iterationSize = remainder;
             }
 
             if(iterationSize == 1)
@@ -112,19 +110,19 @@ public class ClearChat
                     outOfBounds = true;
                 } else {
                     // before deleting, we need to grab the <previous to the oldest> message's id for next iteration.
-                    action = channel.getHistoryBefore(messages.get(messages.size() - 1).getIdLong(), 1);
+                    action = channel.getHistoryBefore(messages.getLast().getIdLong(), 1);
 
                     List<Message> previousMessage = action.complete().getRetrievedHistory();
 
                     // if that message exists (we are not out of bounds)... store it
-                    if(!previousMessage.isEmpty()) messageId = previousMessage.get(0).getIdLong();
+                    if(!previousMessage.isEmpty()) messageId = previousMessage.getFirst().getIdLong();
                     else outOfBounds = true;
                 }
 
                 // queue messages for deletion
                 if(messages.size() == 1)
                 {
-                    messages.get(0).delete().queue();
+                    messages.getFirst().delete().queue();
                 }
                 else if(!messages.isEmpty())
                 {
diff --git a/src/main/java/wtf/beatrice/hidekobot/util/Logger.java b/src/main/java/wtf/beatrice/hidekobot/util/Logger.java
index eeecd46..fcb435e 100644
--- a/src/main/java/wtf/beatrice/hidekobot/util/Logger.java
+++ b/src/main/java/wtf/beatrice/hidekobot/util/Logger.java
@@ -11,7 +11,7 @@ public class Logger<T>
 {
 
     // objects that we need to have for a properly formatted message
-    private String className;
+    private final String className;
     private final String format = "[%date% %time%] [%class%] %message%";
     private final DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
     private final DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("HH:mm:ss");