diff --git a/.checkstyle/checkstyle.xml b/.checkstyle/checkstyle.xml
index 0561029..a30c703 100644
--- a/.checkstyle/checkstyle.xml
+++ b/.checkstyle/checkstyle.xml
@@ -1,197 +1,266 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
-        "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
         "https://checkstyle.org/dtds/configuration_1_3.dtd">
+<module name="Checker">
+    <property name="charset" value="UTF-8"/>
+    <property name="fileExtensions" value="java, properties, xml"/>
+    <property name="severity" value="error"/>
 
-<!--
+    <!-- https://checkstyle.org/config_filefilters.html#BeforeExecutionExclusionFileFilter -->
+    <module name="BeforeExecutionExclusionFileFilter">
+        <property name="fileNamePattern" value="module\-info\.java$"/>
+    </module>
 
-  Checkstyle configuration that checks the sun coding conventions from:
+    <!-- https://checkstyle.org/config_whitespace.html#FileTabCharacter -->
+    <module name="FileTabCharacter">
+        <property name="eachLine" value="true"/>
+    </module>
 
-    - the Java Language Specification at
-      https://docs.oracle.com/javase/specs/jls/se11/html/index.html
+    <!-- https://checkstyle.org/config_misc.html#NewlineAtEndOfFile -->
+    <module name="NewlineAtEndOfFile"/>
 
-    - the Sun Code Conventions at https://www.oracle.com/java/technologies/javase/codeconventions-contents.html
+    <!-- https://checkstyle.org/config_filters.html#SuppressWarningsFilter -->
+    <module name="SuppressWarningsFilter"/>
 
-    - the Javadoc guidelines at
-      https://www.oracle.com/technical-resources/articles/java/javadoc-tool.html
+    <!-- https://checkstyle.org/config_filters.html#SuppressWithPlainTextCommentFilter -->
+    <module name="SuppressWithPlainTextCommentFilter"/>
 
-    - the JDK Api documentation https://docs.oracle.com/en/java/javase/11/
+    <module name="TreeWalker">
+        <!-- https://checkstyle.org/config_misc.html#ArrayTypeStyle -->
+        <module name="ArrayTypeStyle"/>
 
-    - some best practices
+        <!-- https://checkstyle.org/config_javadoc.html#AtclauseOrder -->
+        <module name="AtclauseOrder">
+            <property name="violateExecutionOnNonTightHtml" value="true"/>
+            <property name="tagOrder"
+                      value="@author, @deprecated, @exception, @param, @return, @serial, @serialData, @serialField, @throws, @see, @since, @sinceMinecraft, @version"/>
+        </module>
 
-  Checkstyle is very configurable. Be sure to read the documentation at
-  https://checkstyle.org (or in your downloaded distribution).
+        <!-- https://checkstyle.org/config_imports.html#AvoidStarImport -->
+        <module name="AvoidStarImport"/>
 
-  Most Checks are configurable, be sure to consult the documentation.
+        <!-- https://checkstyle.sourceforge.io/config_blocks.html#NeedBraces -->
+        <module name="NeedBraces"/>
 
-  To completely disable a check, just comment it out or delete it from the file.
-  To suppress certain violations please review suppression filters.
+        <!-- https://checkstyle.org/config_misc.html#AvoidEscapedUnicodeCharacters -->
+        <module name="AvoidEscapedUnicodeCharacters">
+            <property name="allowByTailComment" value="true"/>
+            <property name="allowEscapesForControlCharacters" value="true"/>
+            <property name="allowNonPrintableEscapes" value="true"/>
+        </module>
 
-  Finally, it is worth reading the documentation.
+        <!-- https://checkstyle.org/config_misc.html#CommentsIndentation -->
+        <module name="CommentsIndentation"/>
 
--->
+        <!-- https://checkstyle.org/config_imports.html#CustomImportOrder -->
+        <module name="CustomImportOrder">
+            <property name="customImportOrderRules" value="THIRD_PARTY_PACKAGE###STATIC"/>
+            <property name="standardPackageRegExp" value="^$"/>
+            <property name="sortImportsInGroupAlphabetically" value="true"/>
+        </module>
 
-<module name="Checker">
+        <!-- https://checkstyle.org/config_whitespace.html#EmptyForInitializerPad -->
+        <module name="EmptyForInitializerPad"/>
 
-    <!--
-        If you set the basedir property below, then all reported file
-        names will be relative to the specified directory. See
-        https://checkstyle.org/config.html#Checker
+        <!-- https://checkstyle.org/config_whitespace.html#EmptyForIteratorPad -->
+        <module name="EmptyForIteratorPad"/>
 
-        <property name="basedir" value="${basedir}"/>
-    -->
-    <property name="severity" value="error"/>
+        <!-- https://checkstyle.org/config_whitespace.html#EmptyLineSeparator -->
+        <module name="EmptyLineSeparator">
+            <property name="allowMultipleEmptyLines" value="false"/>
+            <property name="allowMultipleEmptyLinesInsideClassMembers" value="false"/>
+            <property name="allowNoEmptyLineBetweenFields" value="true"/>
+            <property name="tokens"
+                      value="CLASS_DEF, CTOR_DEF, ENUM_DEF, IMPORT, INSTANCE_INIT, INTERFACE_DEF, METHOD_DEF, STATIC_IMPORT, STATIC_INIT, VARIABLE_DEF"/> <!-- remove PACKAGE_DEF, temporarily remove COMPACT_CTOR_DEF, RECORD_DEF -->
+        </module>
 
-    <property name="fileExtensions" value="java, properties"/>
+        <!-- https://checkstyle.org/config_coding.html#FallThrough -->
+        <module name="FallThrough">
+            <property name="checkLastCaseGroup" value="true"/>
+        </module>
 
-    <!-- Excludes all 'module-info.java' files              -->
-    <!-- See https://checkstyle.org/config_filefilters.html -->
-    <module name="BeforeExecutionExclusionFileFilter">
-        <property name="fileNamePattern" value="module\-info\.java$"/>
-    </module>
+        <!-- https://checkstyle.org/config_design.html#FinalClass -->
+        <module name="FinalClass"/>
 
-    <!-- https://checkstyle.org/config_filters.html#SuppressionFilter -->
-    <module name="SuppressionFilter">
-        <property name="file" value="${org.checkstyle.sun.suppressionfilter.config}"
-                  default="checkstyle-suppressions.xml"/>
-        <property name="optional" value="true"/>
-    </module>
+        <!-- https://checkstyle.org/config_whitespace.html#GenericWhitespace -->
+        <module name="GenericWhitespace"/>
 
-    <!-- Checks that a package-info.java file exists for each package.     -->
-    <!-- See https://checkstyle.org/config_javadoc.html#JavadocPackage -->
-    <!--    <module name="JavadocPackage"/>-->
+        <!-- https://checkstyle.org/config_design.html#HideUtilityClassConstructor -->
+        <module name="HideUtilityClassConstructor"/>
 
-    <!-- Checks whether files end with a new line.                        -->
-    <!-- See https://checkstyle.org/config_misc.html#NewlineAtEndOfFile -->
-    <module name="NewlineAtEndOfFile"/>
+        <!-- https://checkstyle.org/config_imports.html#IllegalImport -->
+        <module name="IllegalImport">
+            <property name="illegalPkgs" value="sun, jdk, com.sun"/>
+        </module>
 
-    <!-- Checks that property files contain the same keys.         -->
-    <!-- See https://checkstyle.org/config_misc.html#Translation -->
-    <module name="Translation"/>
+        <!-- https://checkstyle.org/config_coding.html#IllegalTokenText -->
+        <module name="IllegalTokenText">
+            <property name="format"
+                      value="($|[^\\])\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
+            <property name="message"
+                      value="Consider using special escape sequence instead of octal value or Unicode escaped value."/>
+            <property name="tokens" value="CHAR_LITERAL, STRING_LITERAL"/>
+        </module>
 
-    <!-- Checks for Size Violations.                    -->
-    <!-- See https://checkstyle.org/config_sizes.html -->
-    <module name="FileLength"/>
-    <module name="LineLength">
-        <property name="fileExtensions" value="java"/>
-        <property name="max" value="140"/>
-    </module>
+        <!-- https://checkstyle.org/config_misc.html#Indentation -->
+        <module name="Indentation">
+            <property name="arrayInitIndent" value="4"/>
+            <property name="basicOffset" value="4"/>
+            <property name="braceAdjustment" value="0"/>
+            <property name="caseIndent" value="4"/>
+            <property name="lineWrappingIndentation" value="0"/>
+            <property name="throwsIndent" value="4"/>
+        </module>
 
-    <!-- Checks for whitespace                               -->
-    <!-- See https://checkstyle.org/config_whitespace.html -->
-    <module name="FileTabCharacter"/>
-
-    <!-- Miscellaneous other checks.                   -->
-    <!-- See https://checkstyle.org/config_misc.html -->
-    <module name="RegexpSingleline">
-        <property name="format" value="\s+$"/>
-        <property name="minimum" value="0"/>
-        <property name="maximum" value="0"/>
-        <property name="message" value="Line has trailing spaces."/>
-    </module>
+        <!-- https://checkstyle.org/config_javadoc.html#InvalidJavadocPosition -->
+        <module name="InvalidJavadocPosition"/>
 
-    <!-- Checks for Headers                                -->
-    <!-- See https://checkstyle.org/config_header.html   -->
-    <!-- <module name="Header"> -->
-    <!--   <property name="headerFile" value="${checkstyle.header.file}"/> -->
-    <!--   <property name="fileExtensions" value="java"/> -->
-    <!-- </module> -->
+        <!-- https://checkstyle.org/config_javadoc.html#JavadocContentLocation -->
+        <module name="JavadocContentLocation"/>
 
-    <module name="TreeWalker">
+        <!-- https://checkstyle.org/config_javadoc.html#JavadocMissingWhitespaceAfterAsterisk -->
+        <module name="JavadocMissingWhitespaceAfterAsterisk"/>
 
-        <!-- Checks for Javadoc comments.                     -->
-        <!-- See https://checkstyle.org/config_javadoc.html -->
-        <!--        <module name="InvalidJavadocPosition"/>-->
-        <!--        <module name="JavadocMethod"/>-->
-        <!--        <module name="JavadocType"/>-->
-        <!--        <module name="JavadocStyle">-->
-        <!--            <property name="checkFirstSentence" value="false"/>-->
-        <!--        </module>-->
-        <!--        <module name="MissingJavadocMethod"/>-->
-
-        <!-- Checks for Naming Conventions.                  -->
-        <!-- See https://checkstyle.org/config_naming.html -->
-        <module name="ConstantName"/>
-        <module name="LocalFinalVariableName"/>
-        <module name="LocalVariableName"/>
-        <module name="MethodName"/>
-        <module name="PackageName"/>
-        <module name="ParameterName"/>
-        <!--        <module name="StaticVariableName">-->
-        <!--            <property name="applyToPrivate" value="false"/>-->
-        <!--        </module>-->
-        <module name="TypeName"/>
-
-        <!-- Checks for imports                              -->
-        <!-- See https://checkstyle.org/config_imports.html -->
-        <module name="AvoidStarImport"/>
-        <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
-        <module name="RedundantImport"/>
-        <module name="UnusedImports">
-            <property name="processJavadoc" value="true"/>
+        <!-- https://checkstyle.org/config_javadoc.html#JavadocParagraph -->
+        <module name="JavadocParagraph"/>
+
+        <!-- https://checkstyle.org/config_javadoc.html#JavadocMissingWhitespaceAfterAsterisk -->
+        <module name="JavadocTagContinuationIndentation"/>
+
+        <!-- https://checkstyle.org/config_blocks.html#LeftCurly -->
+        <module name="LeftCurly"/>
+
+        <!-- https://checkstyle.org/config_naming.html#MethodName -->
+        <module name="MethodName">
+            <property name="format" value="^(?:(?:.{1,3})|(?:[gs]et[^A-Z].*)|(?:(?:[^gsA-Z]..|.[^e].|..[^t]).+))$"/>
         </module>
 
-        <!-- Checks for whitespace                               -->
-        <!-- See https://checkstyle.org/config_whitespace.html -->
-        <module name="EmptyForIteratorPad"/>
-        <module name="GenericWhitespace"/>
+        <!-- https://checkstyle.org/config_whitespace.html#MethodParamPad -->
         <module name="MethodParamPad"/>
-        <module name="NoWhitespaceAfter"/>
-        <module name="NoWhitespaceBefore"/>
-        <module name="OperatorWrap"/>
-        <module name="ParenPad"/>
-        <module name="TypecastParenPad"/>
-        <module name="WhitespaceAfter"/>
-
-        <!-- Modifier Checks                                    -->
-        <!-- See https://checkstyle.org/config_modifiers.html -->
-        <module name="ModifierOrder"/>
-        <module name="RedundantModifier"/>
 
-        <!-- Checks for blocks. You know, those {}'s         -->
-        <!-- See https://checkstyle.org/config_blocks.html -->
-        <module name="AvoidNestedBlocks"/>
-        <module name="EmptyBlock"/>
-        <module name="LeftCurly"/>
-        <module name="NeedBraces"/>
-        <module name="RightCurly"/>
-
-        <!-- Checks for common coding problems               -->
-        <!-- See https://checkstyle.org/config_coding.html -->
-        <module name="EmptyStatement"/>
-        <module name="EqualsHashCode"/>
-        <module name="IllegalInstantiation"/>
-        <module name="InnerAssignment"/>
-        <module name="MissingSwitchDefault"/>
+        <!-- https://checkstyle.org/config_coding.html#MultipleVariableDeclarations -->
         <module name="MultipleVariableDeclarations"/>
-        <module name="SimplifyBooleanExpression"/>
-        <module name="SimplifyBooleanReturn"/>
 
-        <!-- Checks for class design                         -->
-        <!-- See https://checkstyle.org/config_design.html -->
-        <module name="DesignForExtension"/>
-        <module name="FinalClass"/>
-        <module name="HideUtilityClassConstructor"/>
+        <!-- https://checkstyle.org/config_coding.html#NoFinalizer -->
+        <module name="NoFinalizer"/>
 
+        <!-- https://checkstyle.org/config_whitespace.html#NoLineWrap -->
+        <module name="NoLineWrap"/>
 
-        <!-- Miscellaneous other checks.                   -->
-        <!-- See https://checkstyle.org/config_misc.html -->
-        <module name="ArrayTypeStyle"/>
-        <module name="FinalParameters"/>
-        <module name="TodoComment"/>
-        <module name="UpperEll"/>
+        <!-- https://checkstyle.org/config_javadoc.html#NonEmptyAtclauseDescription -->
+        <module name="NonEmptyAtclauseDescription"/>
+
+        <!-- https://checkstyle.org/config_whitespace.html#NoWhitespaceBefore -->
+        <module name="NoWhitespaceBefore">
+            <property name="allowLineBreaks" value="true"/>
+            <property name="tokens"
+                      value="COMMA, DOT, LABELED_STAT, METHOD_REF, POST_DEC, POST_INC, SEMI"/> <!-- remove ELLIPSIS -->
+        </module>
 
+        <!-- https://checkstyle.org/config_coding.html#OneStatementPerLine -->
+        <module name="OneStatementPerLine"/>
+
+        <!-- https://checkstyle.org/config_misc.html#OuterTypeFilename -->
+        <module name="OuterTypeFilename"/>
+
+        <!-- https://checkstyle.org/config_imports.html#RedundantImport -->
+        <module name="RedundantImport"/>
+
+        <!-- https://checkstyle.org/config_modifier.html#RedundantModifier -->
+        <module name="RedundantModifier">
+            <property name="tokens"
+                      value="ANNOTATION_FIELD_DEF, CLASS_DEF, CTOR_DEF, ENUM_DEF, INTERFACE_DEF, VARIABLE_DEF"/> <!-- remove METHOD_DEF and RESOURCE -->
+        </module>
+
+        <!-- https://checkstyle.org/config_javadoc.html#RequireEmptyLineBeforeBlockTagGroup -->
+        <module name="RequireEmptyLineBeforeBlockTagGroup"/>
+
+        <!-- https://checkstyle.org/config_coding.html#RequireThis -->
         <module name="RequireThis">
             <property name="validateOnlyOverlapping" value="false"/>
         </module>
 
-        <!-- https://checkstyle.org/config_filters.html#SuppressionXpathFilter -->
-        <module name="SuppressionXpathFilter">
-            <property name="file" value="${org.checkstyle.sun.suppressionxpathfilter.config}"
-                      default="checkstyle-xpath-suppressions.xml"/>
-            <property name="optional" value="true"/>
+        <!-- https://checkstyle.org/config_blocks.html#RightCurly -->
+        <module name="RightCurly">
+            <property name="id" value="RightCurlyAlone"/>
+            <property name="option" value="alone"/>
+            <property name="tokens"
+                      value="ANNOTATION_DEF, CLASS_DEF, CTOR_DEF, ENUM_DEF, INSTANCE_INIT, LITERAL_FOR, LITERAL_WHILE, METHOD_DEF, STATIC_INIT"/>
+        </module>
+        <module name="RightCurly">
+            <property name="id" value="RightCurlySame"/>
+            <property name="option" value="same"/>
+            <property name="tokens"
+                      value="LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_IF, LITERAL_TRY"/> <!-- add LITERAL_DO -->
         </module>
 
-    </module>
+        <!-- https://checkstyle.org/config_whitespace.html#SeparatorWrap -->
+        <module name="SeparatorWrap">
+            <property name="id" value="SeparatorWrapEol"/>
+            <property name="option" value="eol"/>
+            <property name="tokens" value="COMMA, SEMI, ELLIPSIS, RBRACK, ARRAY_DECLARATOR, METHOD_REF"/>
+        </module>
+        <module name="SeparatorWrap">
+            <property name="id" value="SeparatorWrapNl"/>
+            <property name="option" value="nl"/>
+            <property name="tokens" value="DOT, AT"/>
+        </module>
+
+        <!-- https://checkstyle.org/config_coding.html#SimplifyBooleanExpression -->
+        <module name="SimplifyBooleanExpression"/>
+
+        <!-- https://checkstyle.org/config_coding.html#SimplifyBooleanReturn -->
+        <module name="SimplifyBooleanReturn"/>
+
+        <!-- https://checkstyle.org/config_whitespace.html#SingleSpaceSeparator -->
+        <module name="SingleSpaceSeparator">
+            <property name="validateComments" value="true"/>
+        </module>
+
+        <!-- https://checkstyle.org/config_javadoc.html#SummaryJavadoc -->
+        <module name="SummaryJavadoc"/>
+
+        <!-- https://checkstyle.org/config_annotation.html#SuppressWarningsHolder -->
+        <module name="SuppressWarningsHolder"/>
+
+        <!-- https://checkstyle.org/config_whitespace.html#TypecastParenPad -->
+        <module name="TypecastParenPad"/>
+
+        <!-- carbon -->
+        <!-- https://checkstyle.sourceforge.io/config_whitespace.html#ParenPad -->
+        <module name="ParenPad"/>
+
+        <!-- https://checkstyle.org/config_coding.html#UnnecessaryParentheses -->
+        <module name="UnnecessaryParentheses"/>
+
+        <!-- https://checkstyle.org/config_imports.html#UnusedImports -->
+        <module name="UnusedImports"/>
 
+        <!-- https://checkstyle.org/config_whitespace.html#WhitespaceAfter -->
+        <module name="WhitespaceAfter">
+            <property name="tokens"
+                      value="COMMA, SEMI, TYPECAST, LITERAL_IF, LITERAL_ELSE, LITERAL_WHILE, LITERAL_FOR"/>
+        </module>
+
+        <!-- https://checkstyle.org/config_whitespace.html#WhitespaceAround -->
+        <module name="WhitespaceAround">
+            <property name="ignoreEnhancedForColon" value="false"/>
+            <property name="allowEmptyTypes" value="true"/>
+            <property name="allowEmptyLambdas" value="true"/>
+            <property name="tokens"
+                      value="ASSIGN, COLON, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, LITERAL_ASSERT, TYPE_EXTENSION_AND"/>
+        </module>
+
+        <!--
+        #####################
+        #### third-party ####
+        #####################
+        -->
+
+        <!-- what insane person willingly uses this rule? I'll never know. -->
+        <!--    &lt;!&ndash; https://gitlab.com/stellardrift/stylecheck/-/blob/dev/src/main/java/ca/stellardrift/stylecheck/StatementNoWhitespaceAfter.java &ndash;&gt;-->
+        <!--    <module name="StatementNoWhitespaceAfter">-->
+        <!--      <property name="tokens" value="LITERAL_CATCH, LITERAL_FOR, LITERAL_IF, LITERAL_TRY, LITERAL_WHILE"/>-->
+        <!--    </module>-->
+    </module>
 </module>
diff --git a/.editorconfig b/.editorconfig
index f72383c..7758b31 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -6,7 +6,7 @@ indent_style = space
 insert_final_newline = true
 max_line_length = 130
 tab_width = 4
-ij_continuation_indent_size = 8
+ij_continuation_indent_size = 4
 ij_formatter_off_tag = @formatter:off
 ij_formatter_on_tag = @formatter:on
 ij_formatter_tags_enabled = false
@@ -137,7 +137,7 @@ ij_java_for_statement_wrap = off
 ij_java_generate_final_locals = true
 ij_java_generate_final_parameters = true
 ij_java_if_brace_force = always
-ij_java_imports_layout = *, |, javax.**, java.**, |, $*
+ij_java_imports_layout = *, |, $*
 ij_java_indent_case_from_switch = true
 ij_java_insert_inner_class_imports = false
 ij_java_insert_override_annotation = true
diff --git a/api/src/main/java/broccolai/tags/api/TagsApi.java b/api/src/main/java/broccolai/tags/api/TagsApi.java
index 5bef8ae..aa71c72 100644
--- a/api/src/main/java/broccolai/tags/api/TagsApi.java
+++ b/api/src/main/java/broccolai/tags/api/TagsApi.java
@@ -16,7 +16,7 @@ public static void register(final @NonNull Injector injector) {
         INJECTOR = injector;
     }
 
-    public static <T extends Service> T getService(final @NonNull Class<T> clazz) {
+    public static <T extends Service> T service(final @NonNull Class<T> clazz) {
         return INJECTOR.getInstance(clazz);
     }
 
diff --git a/api/src/main/java/broccolai/tags/api/model/tag/ConstructedTag.java b/api/src/main/java/broccolai/tags/api/model/tag/ConstructedTag.java
index ecb3798..ae7abb1 100644
--- a/api/src/main/java/broccolai/tags/api/model/tag/ConstructedTag.java
+++ b/api/src/main/java/broccolai/tags/api/model/tag/ConstructedTag.java
@@ -3,7 +3,6 @@
 import broccolai.tags.api.model.Permissible;
 import net.kyori.adventure.text.Component;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 public record ConstructedTag(
         int id,
diff --git a/api/src/main/java/broccolai/tags/api/model/user/TagsUser.java b/api/src/main/java/broccolai/tags/api/model/user/TagsUser.java
index 8d156c6..2c47f0b 100644
--- a/api/src/main/java/broccolai/tags/api/model/user/TagsUser.java
+++ b/api/src/main/java/broccolai/tags/api/model/user/TagsUser.java
@@ -2,11 +2,10 @@
 
 import broccolai.tags.api.model.tag.ConstructedTag;
 import broccolai.tags.api.model.user.impl.ConsoleTagsUser;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.Optional;
 import java.util.UUID;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 public interface TagsUser {
 
@@ -14,7 +13,7 @@ public interface TagsUser {
 
     @NonNull UUID uuid();
 
-    void setCurrent(@Nullable ConstructedTag tag);
+    void current(@Nullable ConstructedTag tag);
 
     @NonNull Optional<Integer> current();
 
diff --git a/api/src/main/java/broccolai/tags/api/model/user/impl/ConsoleTagsUser.java b/api/src/main/java/broccolai/tags/api/model/user/impl/ConsoleTagsUser.java
index 7f9f50e..0cf49b7 100644
--- a/api/src/main/java/broccolai/tags/api/model/user/impl/ConsoleTagsUser.java
+++ b/api/src/main/java/broccolai/tags/api/model/user/impl/ConsoleTagsUser.java
@@ -2,11 +2,10 @@
 
 import broccolai.tags.api.model.tag.ConstructedTag;
 import broccolai.tags.api.model.user.TagsUser;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.Optional;
 import java.util.UUID;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 public final class ConsoleTagsUser implements TagsUser {
 
@@ -20,7 +19,7 @@ public final class ConsoleTagsUser implements TagsUser {
     }
 
     @Override
-    public void setCurrent(final @Nullable ConstructedTag tag) {
+    public void current(final @Nullable ConstructedTag tag) {
         this.currentTag = tag != null ? tag.id() : null;
     }
 
diff --git a/api/src/main/java/broccolai/tags/api/model/user/impl/PlayerTagsUser.java b/api/src/main/java/broccolai/tags/api/model/user/impl/PlayerTagsUser.java
index 3beb012..ffdc30d 100644
--- a/api/src/main/java/broccolai/tags/api/model/user/impl/PlayerTagsUser.java
+++ b/api/src/main/java/broccolai/tags/api/model/user/impl/PlayerTagsUser.java
@@ -2,11 +2,10 @@
 
 import broccolai.tags.api.model.tag.ConstructedTag;
 import broccolai.tags.api.model.user.TagsUser;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import java.util.Optional;
 import java.util.UUID;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 public final class PlayerTagsUser implements TagsUser {
 
@@ -27,7 +26,7 @@ public PlayerTagsUser(
     }
 
     @Override
-    public void setCurrent(final @Nullable ConstructedTag tag) {
+    public void current(final @Nullable ConstructedTag tag) {
         this.current = tag != null ? tag.id() : null;
     }
 
diff --git a/api/src/main/java/broccolai/tags/api/service/DataService.java b/api/src/main/java/broccolai/tags/api/service/DataService.java
index 2c5acb0..e6e8086 100644
--- a/api/src/main/java/broccolai/tags/api/service/DataService.java
+++ b/api/src/main/java/broccolai/tags/api/service/DataService.java
@@ -2,10 +2,9 @@
 
 import broccolai.tags.api.model.Service;
 import broccolai.tags.api.model.user.TagsUser;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.Optional;
 import java.util.UUID;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 public interface DataService extends Service {
 
diff --git a/api/src/main/java/broccolai/tags/api/service/MessageService.java b/api/src/main/java/broccolai/tags/api/service/MessageService.java
index e9d0db4..3aa592e 100644
--- a/api/src/main/java/broccolai/tags/api/service/MessageService.java
+++ b/api/src/main/java/broccolai/tags/api/service/MessageService.java
@@ -3,12 +3,11 @@
 import broccolai.tags.api.model.Service;
 import broccolai.tags.api.model.tag.ConstructedTag;
 import broccolai.tags.api.model.user.TagsUser;
+import java.util.Collection;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
-import java.util.Collection;
-
 public interface MessageService extends Service {
 
     TagResolver prefix();
diff --git a/api/src/main/java/broccolai/tags/api/service/TagsService.java b/api/src/main/java/broccolai/tags/api/service/TagsService.java
index 47c9463..8745150 100644
--- a/api/src/main/java/broccolai/tags/api/service/TagsService.java
+++ b/api/src/main/java/broccolai/tags/api/service/TagsService.java
@@ -4,12 +4,11 @@
 import broccolai.tags.api.model.tag.ConstructedTag;
 import broccolai.tags.api.model.tag.TagDisplayInformation;
 import broccolai.tags.api.model.user.TagsUser;
+import java.util.Collection;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Collection;
-
 public interface TagsService extends Service {
 
     @NotNull ConstructedTag defaultTag();
diff --git a/api/src/main/java/broccolai/tags/api/service/UserService.java b/api/src/main/java/broccolai/tags/api/service/UserService.java
index 1005a62..b2fb238 100644
--- a/api/src/main/java/broccolai/tags/api/service/UserService.java
+++ b/api/src/main/java/broccolai/tags/api/service/UserService.java
@@ -2,12 +2,11 @@
 
 import broccolai.tags.api.model.Service;
 import broccolai.tags.api.model.user.TagsUser;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 public interface UserService extends Service {
 
diff --git a/build.gradle.kts b/build.gradle.kts
index b9182b7..d0d07ea 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -41,6 +41,8 @@ subprojects {
                 ci(true)
                 publishing(true)
             }
+
+            checkstyle("10.12.4")
         }
 
         processResources {
diff --git a/bukkit/src/main/java/broccolai/tags/bukkit/BukkitTagsPlatform.java b/bukkit/src/main/java/broccolai/tags/bukkit/BukkitTagsPlatform.java
index 903e27a..2123d98 100644
--- a/bukkit/src/main/java/broccolai/tags/bukkit/BukkitTagsPlatform.java
+++ b/bukkit/src/main/java/broccolai/tags/bukkit/BukkitTagsPlatform.java
@@ -24,6 +24,7 @@
 import cloud.commandframework.paper.PaperCommandManager;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
+import java.util.Collection;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.ConsoleCommandSender;
@@ -33,8 +34,6 @@
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
-import java.util.Collection;
-
 public final class BukkitTagsPlatform extends JavaPlugin implements TagsPlatform {
 
     private static final @NonNull Class<? extends Listener>[] BUKKIT_LISTENERS = ArrayUtilities.create(
@@ -62,7 +61,7 @@ public void onEnable() {
         this.plugin = injector.getInstance(TagsPlugin.class);
         this.plugin.start();
 
-        CommandManager<CommandUser> commandManager = this.getCommandManager(
+        CommandManager<CommandUser> commandManager = this.commandManager(
                 injector.getInstance(MessageService.class)
         );
 
@@ -77,7 +76,6 @@ public void onEnable() {
             );
         }
 
-
         this.plugin.commands(commandManager, BUKKIT_COMMANDS);
     }
 
@@ -86,7 +84,7 @@ public void onDisable() {
         this.plugin.shutdown();
     }
 
-    private CommandManager<CommandUser> getCommandManager(
+    private CommandManager<CommandUser> commandManager(
             final @NonNull MessageService messageService
     ) {
         try {
@@ -107,7 +105,7 @@ private CommandManager<CommandUser> getCommandManager(
 
             new MinecraftExceptionHandler<CommandUser>()
                     .withDefaultHandlers()
-                    .apply(commandManager, (e) -> e);
+                    .apply(commandManager, e -> e);
 
             commandManager.registerExceptionHandler(UserArgument.UserArgumentException.class, (user, ex) -> {
                 user.sendMessage(messageService.commandErrorUserNotFound(ex.input()));
diff --git a/bukkit/src/main/java/broccolai/tags/bukkit/commands/context/BukkitConsoleCommandUser.java b/bukkit/src/main/java/broccolai/tags/bukkit/commands/context/BukkitConsoleCommandUser.java
index ccc8e5e..4d43cb9 100644
--- a/bukkit/src/main/java/broccolai/tags/bukkit/commands/context/BukkitConsoleCommandUser.java
+++ b/bukkit/src/main/java/broccolai/tags/bukkit/commands/context/BukkitConsoleCommandUser.java
@@ -1,11 +1,10 @@
 package broccolai.tags.bukkit.commands.context;
 
 import broccolai.tags.api.model.user.impl.ConsoleTagsUser;
+import java.util.UUID;
 import org.bukkit.command.CommandSender;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
-import java.util.UUID;
-
 public final class BukkitConsoleCommandUser extends BukkitCommandUser {
 
     public BukkitConsoleCommandUser(final @NonNull CommandSender source) {
diff --git a/bukkit/src/main/java/broccolai/tags/bukkit/commands/context/BukkitPlayerCommandUser.java b/bukkit/src/main/java/broccolai/tags/bukkit/commands/context/BukkitPlayerCommandUser.java
index 2367493..19f2367 100644
--- a/bukkit/src/main/java/broccolai/tags/bukkit/commands/context/BukkitPlayerCommandUser.java
+++ b/bukkit/src/main/java/broccolai/tags/bukkit/commands/context/BukkitPlayerCommandUser.java
@@ -1,10 +1,9 @@
 package broccolai.tags.bukkit.commands.context;
 
+import java.util.UUID;
 import org.bukkit.entity.Player;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
-import java.util.UUID;
-
 public final class BukkitPlayerCommandUser extends BukkitCommandUser {
 
     private final Player player;
diff --git a/bukkit/src/main/java/broccolai/tags/bukkit/inject/PlatformModule.java b/bukkit/src/main/java/broccolai/tags/bukkit/inject/PlatformModule.java
index 2cb2658..6f7583a 100644
--- a/bukkit/src/main/java/broccolai/tags/bukkit/inject/PlatformModule.java
+++ b/bukkit/src/main/java/broccolai/tags/bukkit/inject/PlatformModule.java
@@ -9,12 +9,11 @@
 import broccolai.tags.bukkit.service.BukkitTaskService;
 import broccolai.tags.core.platform.TagsPlatform;
 import com.google.inject.AbstractModule;
+import java.io.File;
 import org.bukkit.plugin.Plugin;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.slf4j.Logger;
 
-import java.io.File;
-
 public final class PlatformModule extends AbstractModule {
 
     private final @NonNull BukkitTagsPlatform plugin;
diff --git a/bukkit/src/main/java/broccolai/tags/bukkit/integrations/BasicIntegration.java b/bukkit/src/main/java/broccolai/tags/bukkit/integrations/BasicIntegration.java
index 46bc237..b7c5886 100644
--- a/bukkit/src/main/java/broccolai/tags/bukkit/integrations/BasicIntegration.java
+++ b/bukkit/src/main/java/broccolai/tags/bukkit/integrations/BasicIntegration.java
@@ -24,10 +24,10 @@ public BasicIntegration(final @NonNull UserService userService, final @NonNull T
 
     @EventHandler
     public void onChat(final @NonNull AsyncChatEvent event) {
-        event.renderer(((source, name, message, viewer) -> {
+        event.renderer((source, name, message, viewer) -> {
             ConstructedTag tag = this.tagsService.load(this.userService.get(source.getUniqueId()));
             return message.replaceText(builder -> builder.matchLiteral("%tag%").replacement(tag.component()));
-        }));
+        });
     }
 
 }
diff --git a/bukkit/src/main/java/broccolai/tags/bukkit/integrations/PapiIntegration.java b/bukkit/src/main/java/broccolai/tags/bukkit/integrations/PapiIntegration.java
index 3f339ea..70cf399 100644
--- a/bukkit/src/main/java/broccolai/tags/bukkit/integrations/PapiIntegration.java
+++ b/bukkit/src/main/java/broccolai/tags/bukkit/integrations/PapiIntegration.java
@@ -48,7 +48,7 @@ public String getVersion() {
     public String onRequest(final @NonNull OfflinePlayer player, final @NonNull String identifier) {
         TagsUser user = this.userService.get(player.getUniqueId());
 
-        if (identifier.equalsIgnoreCase("current")) {
+        if ("current".equalsIgnoreCase(identifier)) {
             ConstructedTag tag = this.tagsService.load(user);
             return LEGACY.serialize(tag.component());
         }
diff --git a/bukkit/src/main/java/broccolai/tags/bukkit/listeners/PlayerListener.java b/bukkit/src/main/java/broccolai/tags/bukkit/listeners/PlayerListener.java
index a62bc3c..226e993 100644
--- a/bukkit/src/main/java/broccolai/tags/bukkit/listeners/PlayerListener.java
+++ b/bukkit/src/main/java/broccolai/tags/bukkit/listeners/PlayerListener.java
@@ -6,9 +6,7 @@
 import broccolai.tags.api.service.TaskService;
 import broccolai.tags.api.service.UserService;
 import com.google.inject.Inject;
-
 import java.util.UUID;
-
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
diff --git a/bukkit/src/main/java/broccolai/tags/bukkit/menu/TagsMenuFactory.java b/bukkit/src/main/java/broccolai/tags/bukkit/menu/TagsMenuFactory.java
index c8c39fb..b9087e1 100644
--- a/bukkit/src/main/java/broccolai/tags/bukkit/menu/TagsMenuFactory.java
+++ b/bukkit/src/main/java/broccolai/tags/bukkit/menu/TagsMenuFactory.java
@@ -8,8 +8,10 @@
 import broccolai.tags.core.config.LocaleConfiguration;
 import broccolai.tags.core.util.FormatingUtilites;
 import com.google.inject.Inject;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.TextComponent;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
@@ -24,10 +26,6 @@
 import org.incendo.interfaces.paper.type.ChestInterface;
 import org.slf4j.Logger;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
 public final class TagsMenuFactory {
 
     private static final ItemStackElement<ChestPane> BOTTOM_BAR_ELEMENT = new ItemStackElement<>(
@@ -85,20 +83,18 @@ private PaginatedTransform<ItemStackElement<ChestPane>, ChestPane, PlayerViewer>
     private List<ItemStackElement<ChestPane>> createTagElements(final @NonNull TagsUser user) {
         return this.tagsService.allTags(user)
                 .stream()
-                .map((tag) -> createTagElement(user, tag))
+                .map(tag -> this.createTagElement(user, tag))
                 .toList();
     }
 
     private ItemStackElement<ChestPane> createTagElement(final @NonNull TagsUser user, final @NonNull ConstructedTag tag) {
-
-
-        Material material = matchMaterialOrDefault(tag.displayInformation().material());
+        Material material = this.matchMaterialOrDefault(tag.displayInformation().material());
         ItemStack item = PaperItemBuilder.ofType(material)
                 .name(tag.component())
                 .lore(this.createTagLore(tag))
                 .build();
 
-        return ItemStackElement.of(item, (ctx) -> {
+        return ItemStackElement.of(item, ctx -> {
             this.actionService.select(user, tag);
         });
     }
@@ -106,7 +102,7 @@ private ItemStackElement<ChestPane> createTagElement(final @NonNull TagsUser use
     private List<Component> createTagLore(final @NonNull ConstructedTag tag) {
         List<Component> result = new ArrayList<>();
 
-        result.addAll(formatTagReason(tag.reason()));
+        result.addAll(this.formatTagReason(tag.reason()));
 
         result.add(Component.empty());
         result.add(this.locale.equip.asComponent());
@@ -117,7 +113,7 @@ private List<Component> createTagLore(final @NonNull ConstructedTag tag) {
     private List<Component> formatTagReason(final @NonNull String reason) {
         return FormatingUtilites.splitString(reason, 30)
                 .stream()
-                .map((text) -> Component.text(text, NamedTextColor.WHITE))
+                .map(text -> Component.text(text, NamedTextColor.WHITE))
                 .collect(Collectors.toList());
     }
 
diff --git a/bukkit/src/main/java/broccolai/tags/bukkit/service/BukkitPipelineUserService.java b/bukkit/src/main/java/broccolai/tags/bukkit/service/BukkitPipelineUserService.java
index 2d73e8f..7249dd8 100644
--- a/bukkit/src/main/java/broccolai/tags/bukkit/service/BukkitPipelineUserService.java
+++ b/bukkit/src/main/java/broccolai/tags/bukkit/service/BukkitPipelineUserService.java
@@ -5,14 +5,13 @@
 import broccolai.tags.core.service.user.PipelineUserService;
 import com.google.inject.Inject;
 import com.google.inject.Injector;
+import java.util.List;
+import java.util.Objects;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
-import java.util.List;
-import java.util.Objects;
-
 public final class BukkitPipelineUserService extends PipelineUserService {
 
     @Inject
diff --git a/core/src/main/java/broccolai/tags/core/TagsPlugin.java b/core/src/main/java/broccolai/tags/core/TagsPlugin.java
index 54180e6..573c7ff 100644
--- a/core/src/main/java/broccolai/tags/core/TagsPlugin.java
+++ b/core/src/main/java/broccolai/tags/core/TagsPlugin.java
@@ -15,9 +15,8 @@
 import com.google.inject.Injector;
 import com.google.inject.Singleton;
 import com.zaxxer.hikari.HikariDataSource;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.Collection;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 @Singleton
 public final class TagsPlugin {
diff --git a/core/src/main/java/broccolai/tags/core/commands/TagsAdminCommand.java b/core/src/main/java/broccolai/tags/core/commands/TagsAdminCommand.java
index be2b482..f1ea167 100644
--- a/core/src/main/java/broccolai/tags/core/commands/TagsAdminCommand.java
+++ b/core/src/main/java/broccolai/tags/core/commands/TagsAdminCommand.java
@@ -14,9 +14,8 @@
 import cloud.commandframework.CommandManager;
 import cloud.commandframework.context.CommandContext;
 import com.google.inject.Inject;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.Collection;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 public final class TagsAdminCommand implements PluginCommand {
 
diff --git a/core/src/main/java/broccolai/tags/core/commands/TagsCommand.java b/core/src/main/java/broccolai/tags/core/commands/TagsCommand.java
index 5068461..09bb96d 100644
--- a/core/src/main/java/broccolai/tags/core/commands/TagsCommand.java
+++ b/core/src/main/java/broccolai/tags/core/commands/TagsCommand.java
@@ -1,10 +1,8 @@
 package broccolai.tags.core.commands;
 
-import broccolai.tags.api.events.event.TagChangeEvent;
 import broccolai.tags.api.model.tag.ConstructedTag;
 import broccolai.tags.api.model.user.TagsUser;
 import broccolai.tags.api.service.ActionService;
-import broccolai.tags.api.service.EventService;
 import broccolai.tags.api.service.MessageService;
 import broccolai.tags.api.service.TagsService;
 import broccolai.tags.api.service.UserService;
@@ -15,9 +13,8 @@
 import cloud.commandframework.CommandManager;
 import cloud.commandframework.context.CommandContext;
 import com.google.inject.Inject;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.Collection;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 public final class TagsCommand implements PluginCommand {
 
diff --git a/core/src/main/java/broccolai/tags/core/commands/arguments/TagArgument.java b/core/src/main/java/broccolai/tags/core/commands/arguments/TagArgument.java
index 5cf1ca9..dd71087 100644
--- a/core/src/main/java/broccolai/tags/core/commands/arguments/TagArgument.java
+++ b/core/src/main/java/broccolai/tags/core/commands/arguments/TagArgument.java
@@ -15,12 +15,11 @@
 import cloud.commandframework.exceptions.parsing.NoInputProvidedException;
 import com.google.inject.assistedinject.Assisted;
 import com.google.inject.assistedinject.AssistedInject;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Queue;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 public class TagArgument extends CommandArgument<@NonNull CommandUser, @NonNull ConstructedTag> {
 
@@ -88,7 +87,6 @@ public TagParser(
                     user = commandContext.get("target");
                 }
 
-
                 if (!this.permissionService.has(user, tag)) {
                     return ArgumentParseResult.failure(new TagArgumentException(input));
                 }
diff --git a/core/src/main/java/broccolai/tags/core/commands/arguments/UserArgument.java b/core/src/main/java/broccolai/tags/core/commands/arguments/UserArgument.java
index ebe6c6d..f5f92e5 100644
--- a/core/src/main/java/broccolai/tags/core/commands/arguments/UserArgument.java
+++ b/core/src/main/java/broccolai/tags/core/commands/arguments/UserArgument.java
@@ -10,10 +10,9 @@
 import cloud.commandframework.exceptions.parsing.NoInputProvidedException;
 import com.google.inject.assistedinject.Assisted;
 import com.google.inject.assistedinject.AssistedInject;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.List;
 import java.util.Queue;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 public class UserArgument extends CommandArgument<@NonNull CommandUser, @NonNull TagsUser> {
 
diff --git a/core/src/main/java/broccolai/tags/core/commands/arguments/modes/TagParserMode.java b/core/src/main/java/broccolai/tags/core/commands/arguments/modes/TagParserMode.java
index 7207010..772e3f3 100644
--- a/core/src/main/java/broccolai/tags/core/commands/arguments/modes/TagParserMode.java
+++ b/core/src/main/java/broccolai/tags/core/commands/arguments/modes/TagParserMode.java
@@ -4,5 +4,6 @@ public enum TagParserMode {
     SELF,
     TARGET,
     NON_SECRET,
-    ANY,
+    ANY
+
 }
diff --git a/core/src/main/java/broccolai/tags/core/commands/context/CommandUser.java b/core/src/main/java/broccolai/tags/core/commands/context/CommandUser.java
index 2f715bc..28d37de 100644
--- a/core/src/main/java/broccolai/tags/core/commands/context/CommandUser.java
+++ b/core/src/main/java/broccolai/tags/core/commands/context/CommandUser.java
@@ -1,10 +1,9 @@
 package broccolai.tags.core.commands.context;
 
+import java.util.UUID;
 import net.kyori.adventure.audience.ForwardingAudience;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
-import java.util.UUID;
-
 public interface CommandUser extends ForwardingAudience.Single {
 
     UUID uuid();
diff --git a/core/src/main/java/broccolai/tags/core/config/MainConfiguration.java b/core/src/main/java/broccolai/tags/core/config/MainConfiguration.java
index f0cf848..0035002 100644
--- a/core/src/main/java/broccolai/tags/core/config/MainConfiguration.java
+++ b/core/src/main/java/broccolai/tags/core/config/MainConfiguration.java
@@ -2,6 +2,7 @@
 
 import broccolai.tags.api.model.tag.TagDisplayInformation;
 import com.google.inject.Singleton;
+import java.util.List;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.ScopedConfigurationNode;
@@ -11,9 +12,6 @@
 import org.spongepowered.configurate.objectmapping.meta.Setting;
 import org.spongepowered.configurate.serialize.SerializationException;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @ConfigSerializable
 @Singleton
 @NonNull
@@ -28,35 +26,35 @@ public final class MainConfiguration implements Configuration {
 
     @Setting
     @Comment(
+        """
+            Potential tags for players to obtain.
+            Increment id for each new tag, if you remove a tag, treat the config as if it's id is still there.
+            Permissions will use this id as it's reference.
+            The name attribute should be a simple one word phrase for selecting tags through commands.
+                                
+            Tag configuration is described as followed:
+                id -> the unique numerical id for tags
+                name -> the unique name for a tag to be used in a command
+                component -> the component to be rendered in chat / menu first line
+                reason -> how a player could obtain the tag
+                display-information:
+                    material -> the material id to use for the menu representation
+                    custom-model-data -> the custom model id to use on items, optionally
             """
-                    Potential tags for players to obtain.
-                    Increment id for each new tag, if you remove a tag, treat the config as if it's id is still there.
-                    Permissions will use this id as it's reference.
-                    The name attribute should be a simple one word phrase for selecting tags through commands.
-                    
-                    Tag configuration is described as followed:
-                        id -> the unique numerical id for tags
-                        name -> the unique name for a tag to be used in a command
-                        component -> the component to be rendered in chat / menu first line
-                        reason -> how a player could obtain the tag
-                        display-information:
-                            material -> the material id to use for the menu representation
-                            custom-model-data -> the custom model id to use on items, optionally
-                    """
     )
-    public List<TagConfiguration> tags = new ArrayList<>() {{
-        this.add(new TagConfiguration(
-                1,
-                "example",
+    public List<TagConfiguration> tags = List.of(
+            new TagConfiguration(
+                    1,
+                    "example",
                 false,
-                "<red><bold>example",
-                "Acquired by playing for an hour",
-                new TagDisplayInformation(
-                        "stick",
-                        5
-                )
-        ));
-    }};
+                    "<red><bold>example",
+                    "Acquired by playing for an hour",
+                    new TagDisplayInformation(
+                            "stick",
+                            5
+                    )
+            )
+    );
 
     //region Configurate
     private static final @NonNull ObjectMapper<MainConfiguration> MAPPER;
diff --git a/core/src/main/java/broccolai/tags/core/config/TagConfiguration.java b/core/src/main/java/broccolai/tags/core/config/TagConfiguration.java
index 98abe8b..17db0d9 100644
--- a/core/src/main/java/broccolai/tags/core/config/TagConfiguration.java
+++ b/core/src/main/java/broccolai/tags/core/config/TagConfiguration.java
@@ -3,7 +3,6 @@
 import broccolai.tags.api.model.tag.TagDisplayInformation;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.spongepowered.configurate.objectmapping.ConfigSerializable;
-import org.spongepowered.configurate.objectmapping.meta.Comment;
 import org.spongepowered.configurate.objectmapping.meta.Setting;
 
 @ConfigSerializable
@@ -17,13 +16,13 @@ public final class TagConfiguration {
     public String name;
 
     @Setting
-    public boolean secret = false;
+    public boolean secret;
 
     @Setting
     public String component;
 
     @Setting
-    public String reason = null;
+    public String reason;
 
     @Setting
     public TagDisplayInformation displayInformation = new TagDisplayInformation(
diff --git a/core/src/main/java/broccolai/tags/core/config/serializers/LocaleEntrySerializer.java b/core/src/main/java/broccolai/tags/core/config/serializers/LocaleEntrySerializer.java
index de598f7..1cb306c 100644
--- a/core/src/main/java/broccolai/tags/core/config/serializers/LocaleEntrySerializer.java
+++ b/core/src/main/java/broccolai/tags/core/config/serializers/LocaleEntrySerializer.java
@@ -2,13 +2,12 @@
 
 import broccolai.tags.core.model.locale.LocaleEntry;
 import broccolai.tags.core.model.locale.impl.BasicLocaleEntry;
+import java.lang.reflect.Type;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.serialize.SerializationException;
 import org.spongepowered.configurate.serialize.TypeSerializer;
 
-import java.lang.reflect.Type;
-
 public final class LocaleEntrySerializer implements TypeSerializer<LocaleEntry> {
 
     public static final LocaleEntrySerializer INSTANCE = new LocaleEntrySerializer();
diff --git a/core/src/main/java/broccolai/tags/core/data/StorageMethod.java b/core/src/main/java/broccolai/tags/core/data/StorageMethod.java
index d52cd6d..7e8cbe7 100644
--- a/core/src/main/java/broccolai/tags/core/data/StorageMethod.java
+++ b/core/src/main/java/broccolai/tags/core/data/StorageMethod.java
@@ -1,8 +1,8 @@
 package broccolai.tags.core.data;
 
 import broccolai.tags.api.service.DataService;
-import broccolai.tags.core.service.data.LPDataService;
 import broccolai.tags.core.service.data.H2DataService;
+import broccolai.tags.core.service.data.LPDataService;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 public enum StorageMethod {
diff --git a/core/src/main/java/broccolai/tags/core/data/jdbi/UserMapper.java b/core/src/main/java/broccolai/tags/core/data/jdbi/UserMapper.java
index f36ae2b..b676dba 100644
--- a/core/src/main/java/broccolai/tags/core/data/jdbi/UserMapper.java
+++ b/core/src/main/java/broccolai/tags/core/data/jdbi/UserMapper.java
@@ -2,15 +2,14 @@
 
 import broccolai.tags.api.model.user.TagsUser;
 import broccolai.tags.api.model.user.impl.PlayerTagsUser;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.UUID;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jdbi.v3.core.mapper.ColumnMapper;
 import org.jdbi.v3.core.mapper.RowMapper;
 import org.jdbi.v3.core.statement.StatementContext;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.UUID;
-
 public final class UserMapper implements RowMapper<TagsUser> {
 
     @Override
diff --git a/core/src/main/java/broccolai/tags/core/inject/ConfigurationModule.java b/core/src/main/java/broccolai/tags/core/inject/ConfigurationModule.java
index 6e8a699..23494c7 100644
--- a/core/src/main/java/broccolai/tags/core/inject/ConfigurationModule.java
+++ b/core/src/main/java/broccolai/tags/core/inject/ConfigurationModule.java
@@ -8,6 +8,8 @@
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
 import com.google.inject.Singleton;
+import java.io.File;
+import java.io.IOException;
 import net.kyori.coffee.functional.function.exceptional.Function2E;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.spongepowered.configurate.CommentedConfigurationNode;
@@ -19,9 +21,6 @@
 import org.spongepowered.configurate.transformation.ConfigurationTransformation;
 import org.spongepowered.configurate.transformation.TransformAction;
 
-import java.io.File;
-import java.io.IOException;
-
 public final class ConfigurationModule extends AbstractModule {
 
     @Provides
diff --git a/core/src/main/java/broccolai/tags/core/inject/PluginModule.java b/core/src/main/java/broccolai/tags/core/inject/PluginModule.java
index 03fb436..6216ff7 100644
--- a/core/src/main/java/broccolai/tags/core/inject/PluginModule.java
+++ b/core/src/main/java/broccolai/tags/core/inject/PluginModule.java
@@ -9,13 +9,12 @@
 import com.google.inject.Singleton;
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.jdbi.v3.core.Jdbi;
-
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jdbi.v3.core.Jdbi;
 
 public final class PluginModule extends AbstractModule {
 
diff --git a/core/src/main/java/broccolai/tags/core/inject/ServiceModule.java b/core/src/main/java/broccolai/tags/core/inject/ServiceModule.java
index 077501f..9ff15f4 100644
--- a/core/src/main/java/broccolai/tags/core/inject/ServiceModule.java
+++ b/core/src/main/java/broccolai/tags/core/inject/ServiceModule.java
@@ -8,8 +8,8 @@
 import broccolai.tags.core.config.MainConfiguration;
 import broccolai.tags.core.data.StorageMethod;
 import broccolai.tags.core.service.action.EventActionService;
-import broccolai.tags.core.service.data.LPDataService;
 import broccolai.tags.core.service.data.H2DataService;
+import broccolai.tags.core.service.data.LPDataService;
 import broccolai.tags.core.service.event.ASMEventService;
 import broccolai.tags.core.service.message.MiniMessageService;
 import broccolai.tags.core.service.tags.MappedTagsService;
diff --git a/core/src/main/java/broccolai/tags/core/platform/TagsPlatform.java b/core/src/main/java/broccolai/tags/core/platform/TagsPlatform.java
index 6ab34a4..cc6ffac 100644
--- a/core/src/main/java/broccolai/tags/core/platform/TagsPlatform.java
+++ b/core/src/main/java/broccolai/tags/core/platform/TagsPlatform.java
@@ -14,15 +14,15 @@
 public interface TagsPlatform {
 
     @NonNull Module @NonNull [] STANDARD_MODULES = new Module[]{
-            new ConfigurationModule(),
-            new PluginModule(),
-            new CloudArgumentFactoryModule(),
-            new ServiceModule()
+        new ConfigurationModule(),
+        new PluginModule(),
+        new CloudArgumentFactoryModule(),
+        new ServiceModule()
     };
 
     @NonNull Class<? extends PluginCommand>[] COMMANDS = ArrayUtilities.create(
-            TagsCommand.class,
-            TagsAdminCommand.class
+        TagsCommand.class,
+        TagsAdminCommand.class
     );
 
 }
diff --git a/core/src/main/java/broccolai/tags/core/service/data/H2DataService.java b/core/src/main/java/broccolai/tags/core/service/data/H2DataService.java
index d2d76d9..70ac5dd 100644
--- a/core/src/main/java/broccolai/tags/core/service/data/H2DataService.java
+++ b/core/src/main/java/broccolai/tags/core/service/data/H2DataService.java
@@ -6,11 +6,10 @@
 import broccolai.tags.core.util.ResourceReader;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.jdbi.v3.core.Jdbi;
-
 import java.util.Optional;
 import java.util.UUID;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jdbi.v3.core.Jdbi;
 
 @Singleton
 public final class H2DataService implements DataService {
diff --git a/core/src/main/java/broccolai/tags/core/service/data/LPDataService.java b/core/src/main/java/broccolai/tags/core/service/data/LPDataService.java
index 2f90ddf..a52d0ac 100644
--- a/core/src/main/java/broccolai/tags/core/service/data/LPDataService.java
+++ b/core/src/main/java/broccolai/tags/core/service/data/LPDataService.java
@@ -3,22 +3,20 @@
 import broccolai.tags.api.model.user.TagsUser;
 import broccolai.tags.api.model.user.impl.PlayerTagsUser;
 import broccolai.tags.api.service.DataService;
+import java.util.Optional;
+import java.util.UUID;
 import net.luckperms.api.LuckPerms;
 import net.luckperms.api.LuckPermsProvider;
 import net.luckperms.api.model.user.User;
 import net.luckperms.api.node.types.MetaNode;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
-import java.util.Optional;
-import java.util.UUID;
-
 public final class LPDataService implements DataService {
 
     private static final String CURRENT_TAG_NODE = "current-tag";
 
     private final LuckPerms luckPerms = LuckPermsProvider.get();
 
-
     @Override
     public @NonNull Optional<@NonNull TagsUser> loadUser(
             final @NonNull UUID uniqueId
diff --git a/core/src/main/java/broccolai/tags/core/service/message/MiniMessageService.java b/core/src/main/java/broccolai/tags/core/service/message/MiniMessageService.java
index 34ba0b7..3d02172 100644
--- a/core/src/main/java/broccolai/tags/core/service/message/MiniMessageService.java
+++ b/core/src/main/java/broccolai/tags/core/service/message/MiniMessageService.java
@@ -7,13 +7,12 @@
 import broccolai.tags.core.config.LocaleConfiguration;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
+import java.util.Collection;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
-import java.util.Collection;
-
 @Singleton
 public final class MiniMessageService implements MessageService {
 
@@ -22,8 +21,8 @@ public final class MiniMessageService implements MessageService {
 
     @Inject
     public MiniMessageService(
-            final @NonNull LocaleConfiguration locale,
-            final @NonNull UserService userService
+        final @NonNull LocaleConfiguration locale,
+        final @NonNull UserService userService
     ) {
         this.locale = locale;
         this.userService = userService;
@@ -66,8 +65,8 @@ public Component commandInfo(final @NonNull ConstructedTag tag) {
 
     @Override
     public Component commandAdminGive(
-            final @NonNull ConstructedTag tag,
-            final @NonNull TagsUser target
+        final @NonNull ConstructedTag tag,
+        final @NonNull TagsUser target
     ) {
         TagResolver tagComponent = TagResolver.resolver("tag", Tag.inserting(tag.component()));
         TagResolver targetComponent = TagResolver.resolver("target", Tag.preProcessParsed(this.nameFromUser(target)));
@@ -77,8 +76,8 @@ public Component commandAdminGive(
 
     @Override
     public Component commandAdminRemove(
-            final @NonNull ConstructedTag tag,
-            final @NonNull TagsUser target
+        final @NonNull ConstructedTag tag,
+        final @NonNull TagsUser target
     ) {
         TagResolver tagComponent = TagResolver.resolver("tag", Tag.inserting(tag.component()));
         TagResolver targetComponent = TagResolver.resolver("target", Tag.preProcessParsed(this.nameFromUser(target)));
diff --git a/core/src/main/java/broccolai/tags/core/service/tags/MappedTagsService.java b/core/src/main/java/broccolai/tags/core/service/tags/MappedTagsService.java
index 54836cf..d6303eb 100644
--- a/core/src/main/java/broccolai/tags/core/service/tags/MappedTagsService.java
+++ b/core/src/main/java/broccolai/tags/core/service/tags/MappedTagsService.java
@@ -9,12 +9,6 @@
 import broccolai.tags.core.config.TagConfiguration;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.minimessage.MiniMessage;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -23,6 +17,11 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.TreeMap;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.MiniMessage;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jetbrains.annotations.NotNull;
 
 @Singleton
 public final class MappedTagsService implements TagsService {
diff --git a/core/src/main/java/broccolai/tags/core/service/user/PartialUserService.java b/core/src/main/java/broccolai/tags/core/service/user/PartialUserService.java
index f70856e..f47adef 100644
--- a/core/src/main/java/broccolai/tags/core/service/user/PartialUserService.java
+++ b/core/src/main/java/broccolai/tags/core/service/user/PartialUserService.java
@@ -2,7 +2,6 @@
 
 import broccolai.tags.api.model.user.TagsUser;
 import cloud.commandframework.services.types.PartialResultService;
-
 import java.util.UUID;
 
 public interface PartialUserService extends PartialResultService<UUID, TagsUser, UserServiceContext> {
diff --git a/core/src/main/java/broccolai/tags/core/service/user/PipelineUserService.java b/core/src/main/java/broccolai/tags/core/service/user/PipelineUserService.java
index ed92969..b8ba83c 100644
--- a/core/src/main/java/broccolai/tags/core/service/user/PipelineUserService.java
+++ b/core/src/main/java/broccolai/tags/core/service/user/PipelineUserService.java
@@ -8,12 +8,11 @@
 import cloud.commandframework.services.ServicePipeline;
 import com.google.inject.Injector;
 import io.leangen.geantyref.TypeToken;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 import java.util.UUID;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 public abstract class PipelineUserService implements UserService {
 
diff --git a/core/src/main/java/broccolai/tags/core/service/user/UserServiceContext.java b/core/src/main/java/broccolai/tags/core/service/user/UserServiceContext.java
index 6d02eff..a9ed60f 100644
--- a/core/src/main/java/broccolai/tags/core/service/user/UserServiceContext.java
+++ b/core/src/main/java/broccolai/tags/core/service/user/UserServiceContext.java
@@ -2,10 +2,9 @@
 
 import broccolai.tags.api.model.user.TagsUser;
 import cloud.commandframework.services.ChunkedRequestContext;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.Collection;
 import java.util.UUID;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 final class UserServiceContext extends ChunkedRequestContext<UUID, TagsUser> {
 
diff --git a/core/src/main/java/broccolai/tags/core/service/user/partials/UserCacheService.java b/core/src/main/java/broccolai/tags/core/service/user/partials/UserCacheService.java
index d37e05d..23bb4d1 100644
--- a/core/src/main/java/broccolai/tags/core/service/user/partials/UserCacheService.java
+++ b/core/src/main/java/broccolai/tags/core/service/user/partials/UserCacheService.java
@@ -8,14 +8,13 @@
 import com.google.common.cache.CacheBuilder;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.io.Closeable;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.function.Consumer;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 @Singleton
 public final class UserCacheService implements PartialUserService, Consumer<Map<UUID, TagsUser>>, Closeable {
@@ -29,7 +28,7 @@ public UserCacheService(final @NonNull DataService dataService) {
         this.dataService = dataService;
         this.uuidCache = CacheBuilder.newBuilder()
                 .maximumSize(100)
-                .<UUID, TagsUser>removalListener((notification) -> this.dataService.saveUser(notification.getValue()))
+                .<UUID, TagsUser>removalListener(notification -> this.dataService.saveUser(notification.getValue()))
                 .build();
     }
 
diff --git a/core/src/main/java/broccolai/tags/core/service/user/partials/UserCreateService.java b/core/src/main/java/broccolai/tags/core/service/user/partials/UserCreateService.java
index c2f1e13..36ceb97 100644
--- a/core/src/main/java/broccolai/tags/core/service/user/partials/UserCreateService.java
+++ b/core/src/main/java/broccolai/tags/core/service/user/partials/UserCreateService.java
@@ -3,12 +3,11 @@
 import broccolai.tags.api.model.user.TagsUser;
 import broccolai.tags.api.model.user.impl.PlayerTagsUser;
 import broccolai.tags.core.service.user.PartialUserService;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 public final class UserCreateService implements PartialUserService {
 
diff --git a/core/src/main/java/broccolai/tags/core/service/user/partials/UserSQLService.java b/core/src/main/java/broccolai/tags/core/service/user/partials/UserSQLService.java
index e3afda5..a214411 100644
--- a/core/src/main/java/broccolai/tags/core/service/user/partials/UserSQLService.java
+++ b/core/src/main/java/broccolai/tags/core/service/user/partials/UserSQLService.java
@@ -5,12 +5,11 @@
 import broccolai.tags.core.service.user.PartialUserService;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 @Singleton
 public final class UserSQLService implements PartialUserService {
diff --git a/core/src/main/java/broccolai/tags/core/subscribers/TagChangeSubscriber.java b/core/src/main/java/broccolai/tags/core/subscribers/TagChangeSubscriber.java
index d0a00c0..8b5fd81 100644
--- a/core/src/main/java/broccolai/tags/core/subscribers/TagChangeSubscriber.java
+++ b/core/src/main/java/broccolai/tags/core/subscribers/TagChangeSubscriber.java
@@ -12,7 +12,7 @@ public final class TagChangeSubscriber implements EventListener {
     @Subscribe
     @PostOrder(PostOrders.LAST)
     public void onTagChange(final @NonNull TagChangeEvent event) {
-        event.user().setCurrent(event.tag());
+        event.user().current(event.tag());
     }
 
 }
diff --git a/core/src/main/java/broccolai/tags/core/util/ArrayUtilities.java b/core/src/main/java/broccolai/tags/core/util/ArrayUtilities.java
index d942f10..2c373a4 100644
--- a/core/src/main/java/broccolai/tags/core/util/ArrayUtilities.java
+++ b/core/src/main/java/broccolai/tags/core/util/ArrayUtilities.java
@@ -1,11 +1,10 @@
 package broccolai.tags.core.util;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.util.ArrayDeque;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Deque;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 public final class ArrayUtilities {
 
diff --git a/core/src/main/java/broccolai/tags/core/util/FormatingUtilites.java b/core/src/main/java/broccolai/tags/core/util/FormatingUtilites.java
index 00be6a3..3a1ad9a 100644
--- a/core/src/main/java/broccolai/tags/core/util/FormatingUtilites.java
+++ b/core/src/main/java/broccolai/tags/core/util/FormatingUtilites.java
@@ -28,4 +28,7 @@ public static List<String> splitString(String input, int maxLength) {
         return lines;
     }
 
+    private FormatingUtilites() {
+    }
+
 }
diff --git a/core/src/main/java/broccolai/tags/core/util/ResourceReader.java b/core/src/main/java/broccolai/tags/core/util/ResourceReader.java
index edead6e..b1ac044 100644
--- a/core/src/main/java/broccolai/tags/core/util/ResourceReader.java
+++ b/core/src/main/java/broccolai/tags/core/util/ResourceReader.java
@@ -1,12 +1,11 @@
 package broccolai.tags.core.util;
 
 import com.google.common.io.CharStreams;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 public final class ResourceReader {
 
diff --git a/gradle/libs.versions.conf b/gradle/libs.versions.conf
index 391fcd0..53fe3e4 100644
--- a/gradle/libs.versions.conf
+++ b/gradle/libs.versions.conf
@@ -52,6 +52,7 @@ versions = {
   corn = "3.2.0"
   slf4j = "1.7.30"
   caffeine = "3.1.0"
+  stylecheck = "0.2.1"
 
   # Bukkit
   paper-api = "1.19-R0.1-SNAPSHOT"
@@ -109,6 +110,7 @@ dependencies = {
   corn-minecraft-paper = {group = "broccolai.corn", name = "corn-minecraft-paper", version.ref = "corn"}
   slf4j = {group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j"}
   caffeine = {group = "com.github.ben-manes.caffeine", name = "caffeine", version.ref = "caffeine"}
+  stylecheck = {group = "ca.stellardrift", name = "stylecheck", version.ref = "stylecheck"}
 
   # Bukkit
   paper-api = {group = "io.papermc.paper", name = "paper-api", version.ref = "paper-api"}