diff --git a/.editorconfig b/.editorconfig
index 33cca13..0959717 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -14,6 +14,15 @@ ij_smart_tabs = false
 ij_visual_guides = 80, 120
 ij_wrap_on_typing = false
 
+[*.yml]
+indent_size = 2
+tab_width = 2
+ij_yaml_keep_indents_on_empty_lines = false
+ij_yaml_keep_line_breaks = true
+ij_yaml_space_before_colon = false
+ij_yaml_spaces_within_braces = true
+ij_yaml_spaces_within_brackets = false
+
 [*.java]
 ij_java_align_consecutive_assignments = false
 ij_java_align_consecutive_variable_declarations = false
@@ -72,12 +81,12 @@ ij_java_case_statement_on_separate_line = true
 ij_java_catch_on_new_line = false
 ij_java_class_annotation_wrap = split_into_lines
 ij_java_class_brace_style = end_of_line
-ij_java_class_count_to_use_import_on_demand = 5
+ij_java_class_count_to_use_import_on_demand = 3
 ij_java_class_names_in_javadoc = 1
 ij_java_deconstruction_list_wrap = on_every_item
 ij_java_do_not_indent_top_level_class_members = false
-ij_java_do_not_wrap_after_single_annotation = false
-ij_java_do_not_wrap_after_single_annotation_in_parameter = false
+ij_java_do_not_wrap_after_single_annotation = true
+ij_java_do_not_wrap_after_single_annotation_in_parameter = true
 ij_java_do_while_brace_force = if_multiline
 ij_java_doc_add_blank_line_after_description = true
 ij_java_doc_add_blank_line_after_param_comments = false
@@ -102,7 +111,7 @@ ij_java_enum_constants_wrap = on_every_item
 ij_java_enum_field_annotation_wrap = off
 ij_java_extends_keyword_wrap = normal
 ij_java_extends_list_wrap = normal
-ij_java_field_annotation_wrap = split_into_lines
+ij_java_field_annotation_wrap = normal
 ij_java_field_name_prefix =
 ij_java_field_name_suffix =
 ij_java_finally_on_new_line = false
@@ -154,7 +163,7 @@ ij_java_new_line_after_lparen_in_deconstruction_pattern = true
 ij_java_new_line_after_lparen_in_record_header = true
 ij_java_new_line_when_body_is_presented = false
 ij_java_packages_to_use_import_on_demand = java.awt.*, javax.swing.*
-ij_java_parameter_annotation_wrap = off
+ij_java_parameter_annotation_wrap = normal
 ij_java_parameter_name_prefix =
 ij_java_parameter_name_suffix =
 ij_java_parentheses_expression_new_line_after_left_paren = true
@@ -267,7 +276,7 @@ ij_java_use_external_annotations = false
 ij_java_use_fq_class_names = false
 ij_java_use_relative_indents = false
 ij_java_use_single_class_imports = true
-ij_java_variable_annotation_wrap = off
+ij_java_variable_annotation_wrap = normal
 ij_java_visibility = public
 ij_java_while_brace_force = if_multiline
 ij_java_while_on_new_line = false
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 471f526..e1e36ab 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,4 +37,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: Artifacts
-          path: build/libs/
\ No newline at end of file
+          path: build/libs/
diff --git a/src/main/java/com/kevinsundqvistnorlen/rubi/IRubyStyle.java b/src/main/java/com/kevinsundqvistnorlen/rubi/IRubyStyle.java
index 4434f2e..588063a 100644
--- a/src/main/java/com/kevinsundqvistnorlen/rubi/IRubyStyle.java
+++ b/src/main/java/com/kevinsundqvistnorlen/rubi/IRubyStyle.java
@@ -2,12 +2,14 @@
 
 import net.minecraft.text.Style;
 
-public interface IRubyStyle {
-    Style withRuby(String word, String ruby);
-    RubyText getRuby();
-    Style removeRuby();
+import java.util.Optional;
 
-    static RubyText getRuby(Style style) {
-        return ((IRubyStyle) style).getRuby();
+public interface IRubyStyle {
+    static Optional<RubyText> getRuby(Style style) {
+        return Optional.ofNullable(((IRubyStyle) style).rubi$getRuby());
     }
+
+    Style rubi$withRuby(String word, String ruby);
+    RubyText rubi$getRuby();
+    Style rubi$removeRuby();
 }
diff --git a/src/main/java/com/kevinsundqvistnorlen/rubi/RubyText.java b/src/main/java/com/kevinsundqvistnorlen/rubi/RubyText.java
index caffc2e..aab0a1e 100644
--- a/src/main/java/com/kevinsundqvistnorlen/rubi/RubyText.java
+++ b/src/main/java/com/kevinsundqvistnorlen/rubi/RubyText.java
@@ -1,24 +1,17 @@
 package com.kevinsundqvistnorlen.rubi;
 
-import com.kevinsundqvistnorlen.rubi.option.ITextHandler;
 import com.kevinsundqvistnorlen.rubi.option.RubyRenderMode;
 import net.minecraft.client.font.TextHandler;
-import net.minecraft.text.OrderedText;
-import net.minecraft.text.Style;
-import net.minecraft.text.TextVisitFactory;
+import net.minecraft.text.*;
 import org.apache.commons.lang3.mutable.MutableFloat;
-import org.apache.commons.lang3.mutable.MutableObject;
 import org.joml.Matrix4f;
 
-import java.util.*;
+import java.util.Objects;
 import java.util.regex.Pattern;
 
-public record RubyText(String text, String ruby) {
-
+public record RubyText(String text, String ruby, Style style) {
     public static final Pattern RUBY_PATTERN = Pattern.compile("\\^\\s*(.+?)\\s*\\(\\s*(.+?)\\s*\\)");
-    public static final Pattern RUBY_PATTERN_FOR_STRIPPING = Pattern.compile("§\\^\\s*(.+?)\\s*\\(\\s*(.+?)\\s*\\)");
-
-    public static final char RUBY_MARKER = '\uFFFC';//'\ue9c0';
+    public static final Pattern RUBY_PATTERN_FOR_STRIPPING = Pattern.compile("§" + RUBY_PATTERN.pattern());
 
     public static final float RUBY_SCALE = 0.5f;
     public static final float RUBY_OVERLAP = 0.1f;
@@ -34,39 +27,48 @@ public static String strip(String returnValue) {
         return sb.toString();
     }
 
-    public float getWidth(ITextHandler textHandler, Style style) {
-        var mode = RubyRenderMode.getOption().getValue();
-        float baseWidth = 0f,
-              rubyWidth = 0f;
-        if (mode != RubyRenderMode.REPLACE) baseWidth = textHandler.getWidth(OrderedText.styledForwardsVisitedString(this.text(), style));
-        if (mode != RubyRenderMode.HIDDEN) rubyWidth = textHandler.getWidth(OrderedText.styledForwardsVisitedString(this.ruby(), style));
-        return switch (mode) {
-            case ABOVE, BELOW -> Math.max(
-                baseWidth * RubyText.TEXT_SCALE,
-                rubyWidth * RubyText.RUBY_SCALE
-            );
-            case HIDDEN -> baseWidth;
-            case REPLACE -> rubyWidth;
-        };
+    public float draw(
+        float x,
+        float y,
+        Matrix4f matrix,
+        TextHandler handler,
+        int fontHeight,
+        TextDrawer drawer
+    ) {
+        float width = handler.getWidth(OrderedText.styled('', this.style));
+
+        switch (RubyRenderMode.getOption().getValue()) {
+            case ABOVE -> this.drawAbove(x, y, width, matrix, handler, fontHeight, drawer);
+            case BELOW -> this.drawBelow(x, y, width, matrix, handler, fontHeight, drawer);
+            case REPLACE -> this.drawReplace(x, y, matrix, drawer);
+            case HIDDEN -> this.drawHidden(x, y, matrix, drawer);
+        }
+
+        return width;
     }
 
-    public float getWidth(TextHandler.WidthRetriever widthRetriever, Style style) {
-        var mode = RubyRenderMode.getOption().getValue();
-        MutableFloat baseWidth = new MutableFloat(),
-                     rubyWidth = new MutableFloat();
-        if (mode != RubyRenderMode.REPLACE) TextVisitFactory.visitForwards(this.text(), style, (unused, s, codePoint) -> {
-            baseWidth.add(widthRetriever.getWidth(codePoint, s));
-            return true;
-        });
-        if (mode != RubyRenderMode.HIDDEN) TextVisitFactory.visitForwards(this.ruby(), style, (unused, s, codePoint) -> {
-            rubyWidth.add(widthRetriever.getWidth(codePoint, s));
-            return true;
-        });
+    public float getWidth(TextHandler.WidthRetriever widthRetriever) {
+        final var mode = RubyRenderMode.getOption().getValue();
+        final var style = ((IRubyStyle) this.style).rubi$removeRuby();
+        MutableFloat baseWidth = new MutableFloat(), rubyWidth = new MutableFloat();
+
+        if (mode != RubyRenderMode.REPLACE) {
+            TextVisitFactory.visitForwards(this.text, style, (unused, s, codePoint) -> {
+                baseWidth.add(widthRetriever.getWidth(codePoint, s));
+                return true;
+            });
+        }
+
+        if (mode != RubyRenderMode.HIDDEN) {
+            TextVisitFactory.visitForwards(this.ruby, style, (unused, s, codePoint) -> {
+                rubyWidth.add(widthRetriever.getWidth(codePoint, s));
+                return true;
+            });
+        }
+
         return switch (mode) {
-            case ABOVE, BELOW -> Math.max(
-                baseWidth.getValue() * RubyText.TEXT_SCALE,
-                rubyWidth.getValue() * RubyText.RUBY_SCALE
-            );
+            case ABOVE, BELOW ->
+                Math.max(baseWidth.getValue() * RubyText.TEXT_SCALE, rubyWidth.getValue() * RubyText.RUBY_SCALE);
             case HIDDEN -> baseWidth.getValue();
             case REPLACE -> rubyWidth.getValue();
         };
@@ -74,52 +76,17 @@ public float getWidth(TextHandler.WidthRetriever widthRetriever, Style style) {
 
     @Override
     public boolean equals(Object o) {
-        if (o == null || getClass() != o.getClass()) return false;
-        RubyText rubyText = (RubyText) o;
-        return Objects.equals(text, rubyText.text) && Objects.equals(ruby, rubyText.ruby);
+        if (o == null || this.getClass() != o.getClass()) return false;
+        RubyText other = (RubyText) o;
+        return Objects.equals(this.text, other.text()) && Objects.equals(this.ruby, other.ruby());
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(text, ruby);
-    }
-
-    public static float draw(
-        OrderedText rubiCharacter,
-        float x,
-        float y,
-        Matrix4f matrix,
-        TextHandler handler,
-        int fontHeight,
-        TextDrawer drawer
-    ) {
-        float width = handler.getWidth(rubiCharacter);
-
-        final MutableObject<RubyText> rubyTextWrapper = new MutableObject<>(null);
-        final MutableObject<Style> styleWrapper = new MutableObject<>(null);
-        rubiCharacter.accept((index, style, codePoint) -> {
-            if (rubyTextWrapper.getValue() != null) throw new IllegalStateException("Expected only one element in OrderedText rubiCharacter");
-            if (codePoint != RubyText.RUBY_MARKER || IRubyStyle.getRuby(style) == null)
-                throw new IllegalArgumentException("Expected rubi character");
-            rubyTextWrapper.setValue(IRubyStyle.getRuby(style));
-            styleWrapper.setValue(style);
-            return true;
-        });
-
-        final var rubyText = rubyTextWrapper.getValue();
-        final var style = ((IRubyStyle) styleWrapper.getValue()).removeRuby();
-        switch (RubyRenderMode.getOption().getValue()) {
-            case ABOVE -> rubyText.drawAbove(style, x, y, width, matrix, handler, fontHeight, drawer);
-            case BELOW -> rubyText.drawBelow(style, x, y, width, matrix, handler, fontHeight, drawer);
-            case REPLACE -> rubyText.drawReplace(style, x, y, matrix, drawer);
-            case HIDDEN -> rubyText.drawHidden(style, x, y, matrix, drawer);
-        }
-
-        return width;
+        return Objects.hash(this.text, this.ruby);
     }
 
     private void drawRubyPair(
-        Style style,
         float x,
         float yText,
         float yRuby,
@@ -128,8 +95,10 @@ private void drawRubyPair(
         TextHandler handler,
         Matrix4f matrix
     ) {
+        final var style = ((IRubyStyle) this.style).rubi$removeRuby();
+
         drawer.drawSpacedApart(
-            OrderedText.styledForwardsVisitedString(this.text(), style),
+            OrderedText.styledForwardsVisitedString(this.text, style),
             x,
             yText,
             RubyText.TEXT_SCALE,
@@ -139,7 +108,7 @@ private void drawRubyPair(
         );
 
         drawer.drawSpacedApart(
-            OrderedText.styledForwardsVisitedString(this.ruby(), style.withUnderline(false).withStrikethrough(false)),
+            OrderedText.styledForwardsVisitedString(this.ruby, style.withUnderline(false).withStrikethrough(false)),
             x,
             yRuby,
             RubyText.RUBY_SCALE,
@@ -150,7 +119,6 @@ private void drawRubyPair(
     }
 
     public void drawAbove(
-        Style style,
         float x,
         float y,
         float width,
@@ -165,11 +133,10 @@ public void drawAbove(
         float yBody = y + (fontHeight - textHeight);
         float yAbove = yBody - rubyHeight + fontHeight * RubyText.RUBY_OVERLAP;
 
-        this.drawRubyPair(style, x, yBody, yAbove, width, drawer, handler, matrix);
+        this.drawRubyPair(x, yBody, yAbove, width, drawer, handler, matrix);
     }
 
     public void drawBelow(
-        Style style,
         float x,
         float y,
         float width,
@@ -181,26 +148,14 @@ public void drawBelow(
         float textHeight = fontHeight * RubyText.TEXT_SCALE;
         float yBelow = y + textHeight - fontHeight * RubyText.RUBY_OVERLAP;
 
-        this.drawRubyPair(style, x, y, yBelow, width, drawer, handler, matrix);
+        this.drawRubyPair(x, y, yBelow, width, drawer, handler, matrix);
     }
 
-    public void drawReplace(
-        Style style,
-        float x,
-        float y,
-        Matrix4f matrix,
-        TextDrawer drawer
-    ) {
-        drawer.draw(OrderedText.styledForwardsVisitedString(this.ruby(), style), x, y, matrix);
+    public void drawReplace(float x, float y, Matrix4f matrix, TextDrawer drawer) {
+        drawer.draw(OrderedText.styledForwardsVisitedString(this.ruby, this.style), x, y, matrix);
     }
 
-    public void drawHidden(
-        Style style,
-        float x,
-        float y,
-        Matrix4f matrix,
-        TextDrawer drawer
-    ) {
-        drawer.draw(OrderedText.styledForwardsVisitedString(this.text(), style), x, y, matrix);
+    public void drawHidden(float x, float y, Matrix4f matrix, TextDrawer drawer) {
+        drawer.draw(OrderedText.styledForwardsVisitedString(this.text, this.style), x, y, matrix);
     }
 }
diff --git a/src/main/java/com/kevinsundqvistnorlen/rubi/TextDrawer.java b/src/main/java/com/kevinsundqvistnorlen/rubi/TextDrawer.java
index 9195823..a97749e 100644
--- a/src/main/java/com/kevinsundqvistnorlen/rubi/TextDrawer.java
+++ b/src/main/java/com/kevinsundqvistnorlen/rubi/TextDrawer.java
@@ -3,70 +3,61 @@
 import net.minecraft.client.font.TextHandler;
 import net.minecraft.text.OrderedText;
 import org.apache.commons.lang3.mutable.MutableFloat;
-import org.joml.*;
-
-import java.lang.Math;
+import org.joml.Matrix4f;
 
 @FunctionalInterface
 public interface TextDrawer {
+    static int draw(
+        OrderedText text, float x, float y, Matrix4f matrix, TextHandler handler, int fontHeight, TextDrawer drawer
+    ) {
+        final var advance = new MutableFloat(x);
+        text.accept((index, style, codePoint) -> {
+            IRubyStyle
+                .getRuby(style)
+                .ifPresentOrElse(
+                    (rubyText) ->
+                        advance.add(rubyText.draw(
+                            advance.getValue(),
+                            y,
+                            matrix,
+                            handler,
+                            fontHeight,
+                            drawer
+                        )),
+                    () -> {
+                        var styledChar = OrderedText.styled(codePoint, style);
+                        drawer.draw(
+                            styledChar,
+                            advance.getAndAdd((int) handler.getWidth(styledChar)),
+                            y,
+                            matrix
+                        );
+                    }
+                );
+            return true;
+        });
+
+        return (int) Math.ceil(advance.getValue());
+    }
+
     void draw(OrderedText text, float x, float y, Matrix4f matrix);
 
-    default void drawScaled(
-        OrderedText text,
-        float x,
-        float y,
-        float scale,
-        Matrix4f matrix
-    ) {
+    default void drawScaled(OrderedText text, float x, float y, float scale, Matrix4f matrix) {
         this.draw(text, x, y, new Matrix4f(matrix).scaleAround(scale, x, y, 0));
     }
 
     default void drawSpacedApart(
-        OrderedText text,
-        float x,
-        float y,
-        float scale,
-        float boxWidth,
-        Matrix4f matrix,
-        TextHandler handler
+        OrderedText text, float x, float y, float scale, float boxWidth, Matrix4f matrix, TextHandler handler
     ) {
         float width = handler.getWidth(text) * scale;
         float gap = (boxWidth - width) / Utils.lengthOfOrdered(text);
 
         var xx = new MutableFloat(x + gap / 2);
         text.accept((index, style, codePoint) -> {
-            var styled = OrderedText.styled(codePoint, style);
-            this.drawScaled(styled, xx.floatValue(), y, scale, matrix);
-            xx.add(handler.getWidth(styled) * scale + gap);
+            var styledChar = OrderedText.styled(codePoint, style);
+            this.drawScaled(styledChar, xx.floatValue(), y, scale, matrix);
+            xx.add(handler.getWidth(styledChar) * scale + gap);
             return true;
         });
     }
-
-    static int draw(
-        OrderedText text,
-        float x,
-        float y,
-        Matrix4f matrix,
-        TextHandler handler,
-        int fontHeight,
-        TextDrawer drawer
-    ) {
-        final var advance = new MutableFloat(x);
-
-        Utils.splitWithDelimitersOrderedText(text, RubyText.RUBY_MARKER, orderedText -> {
-            drawer.draw(orderedText, advance.getAndAdd((int) handler.getWidth(orderedText)), y, matrix);
-        }, orderedText ->
-            advance.add(RubyText.draw(
-                orderedText,
-                advance.getValue(),
-                y,
-                matrix,
-                handler,
-                fontHeight,
-                drawer
-            ))
-        );
-
-        return (int) Math.ceil(advance.getValue());
-    }
 }
diff --git a/src/main/java/com/kevinsundqvistnorlen/rubi/Utils.java b/src/main/java/com/kevinsundqvistnorlen/rubi/Utils.java
index afd0ee8..79a2a04 100644
--- a/src/main/java/com/kevinsundqvistnorlen/rubi/Utils.java
+++ b/src/main/java/com/kevinsundqvistnorlen/rubi/Utils.java
@@ -2,13 +2,10 @@
 
 import net.minecraft.text.*;
 import org.apache.commons.lang3.mutable.MutableInt;
-import org.apache.commons.lang3.mutable.MutableObject;
-import org.slf4j.*;
-
-import java.util.function.Consumer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class Utils {
-
     public static final Logger LOGGER = LoggerFactory.getLogger("Rubi");
 
     public static OrderedText orderedFrom(String text) {
@@ -30,24 +27,4 @@ public static int lengthOfOrdered(OrderedText text) {
         });
         return length.getValue();
     }
-
-    public static void splitWithDelimitersOrderedText(
-        OrderedText text,
-        int splitCodePoint,
-        Consumer<OrderedText> splitConsumer,
-        Consumer<OrderedText> delimiterConsumer
-    ) {
-        MutableObject<OrderedText> current = new MutableObject<>(OrderedText.EMPTY);
-        text.accept((index, style, codePoint) -> {
-            if (codePoint == splitCodePoint) {
-                splitConsumer.accept(current.getValue());
-                current.setValue(OrderedText.EMPTY);
-                delimiterConsumer.accept(OrderedText.styled(codePoint, style));
-                return true;
-            }
-            current.setValue(OrderedText.innerConcat(current.getValue(), OrderedText.styled(codePoint, style)));
-            return true;
-        });
-        splitConsumer.accept(current.getValue());
-    }
 }
diff --git a/src/main/java/com/kevinsundqvistnorlen/rubi/mixin/client/MixinAccessibilityOptionsScreen.java b/src/main/java/com/kevinsundqvistnorlen/rubi/mixin/client/MixinAccessibilityOptionsScreen.java
index 452ef38..2e88fc0 100644
--- a/src/main/java/com/kevinsundqvistnorlen/rubi/mixin/client/MixinAccessibilityOptionsScreen.java
+++ b/src/main/java/com/kevinsundqvistnorlen/rubi/mixin/client/MixinAccessibilityOptionsScreen.java
@@ -4,14 +4,14 @@
 import net.minecraft.client.gui.screen.option.AccessibilityOptionsScreen;
 import net.minecraft.client.option.SimpleOption;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.*;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import java.util.Arrays;
 
 @Mixin(AccessibilityOptionsScreen.class)
 public class MixinAccessibilityOptionsScreen {
-
     @Inject(method = "getOptions", at = @At("RETURN"), cancellable = true)
     private static void injectGetOptions(CallbackInfoReturnable<SimpleOption<?>[]> info) {
         SimpleOption<?>[] options = info.getReturnValue();
diff --git a/src/main/java/com/kevinsundqvistnorlen/rubi/mixin/client/MixinGameOptions.java b/src/main/java/com/kevinsundqvistnorlen/rubi/mixin/client/MixinGameOptions.java
index f7bfae9..bd8f6e8 100644
--- a/src/main/java/com/kevinsundqvistnorlen/rubi/mixin/client/MixinGameOptions.java
+++ b/src/main/java/com/kevinsundqvistnorlen/rubi/mixin/client/MixinGameOptions.java
@@ -3,12 +3,12 @@
 import com.kevinsundqvistnorlen.rubi.option.RubyRenderMode;
 import net.minecraft.client.option.GameOptions;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.*;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(GameOptions.class)
 public class MixinGameOptions {
-
     @Inject(method = "accept", at = @At("HEAD"))
     private void injectAccept(GameOptions.Visitor visitor, CallbackInfo info) {
         RubyRenderMode.accept(visitor);
diff --git a/src/main/java/com/kevinsundqvistnorlen/rubi/mixin/client/MixinStringVisitable.java b/src/main/java/com/kevinsundqvistnorlen/rubi/mixin/client/MixinStringVisitable.java
index a494856..337798c 100644
--- a/src/main/java/com/kevinsundqvistnorlen/rubi/mixin/client/MixinStringVisitable.java
+++ b/src/main/java/com/kevinsundqvistnorlen/rubi/mixin/client/MixinStringVisitable.java
@@ -1,13 +1,14 @@
 package com.kevinsundqvistnorlen.rubi.mixin.client;
+
 import com.kevinsundqvistnorlen.rubi.RubyText;
 import net.minecraft.text.StringVisitable;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.*;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(StringVisitable.class)
 public interface MixinStringVisitable {
-
     @Inject(method = "getString", at = @At("RETURN"), cancellable = true)
     default void injectGetString(CallbackInfoReturnable<String> info) {
         info.setReturnValue(RubyText.strip(info.getReturnValue()));
diff --git a/src/main/java/com/kevinsundqvistnorlen/rubi/mixin/client/MixinStyle.java b/src/main/java/com/kevinsundqvistnorlen/rubi/mixin/client/MixinStyle.java
index a451f09..03d9a6f 100644
--- a/src/main/java/com/kevinsundqvistnorlen/rubi/mixin/client/MixinStyle.java
+++ b/src/main/java/com/kevinsundqvistnorlen/rubi/mixin/client/MixinStyle.java
@@ -4,6 +4,7 @@
 import com.kevinsundqvistnorlen.rubi.RubyText;
 import net.minecraft.text.*;
 import net.minecraft.util.Identifier;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.*;
 import org.spongepowered.asm.mixin.gen.Invoker;
@@ -16,48 +17,21 @@
 
 @Mixin(Style.class)
 public abstract class MixinStyle implements IRubyStyle {
-
-    @Shadow
-    public abstract boolean equals(Object o);
-    @Final
-    @Shadow
-    TextColor color;
-    @Final
-    @Shadow
-    Integer shadowColor;
-    @Final
-    @Shadow
-    Boolean bold;
-    @Final
-    @Shadow
-    Boolean italic;
-    @Final
-    @Shadow
-    Boolean underlined;
-    @Final
-    @Shadow
-    Boolean strikethrough;
-    @Final
-    @Shadow
-    Boolean obfuscated;
-    @Final
-    @Shadow
-    ClickEvent clickEvent;
-    @Final
-    @Shadow
-    HoverEvent hoverEvent;
-    @Final
-    @Shadow
-    String insertion;
-    @Final
-    @Shadow
-    Identifier font;
-
-    @Unique
-    private @Nullable RubyText ruby;
+    @Shadow @Final private TextColor color;
+    @Shadow @Final private Integer shadowColor;
+    @Shadow @Final private Boolean bold;
+    @Shadow @Final private Boolean italic;
+    @Shadow @Final private Boolean underlined;
+    @Shadow @Final private Boolean strikethrough;
+    @Shadow @Final private Boolean obfuscated;
+    @Shadow @Final private ClickEvent clickEvent;
+    @Shadow @Final private HoverEvent hoverEvent;
+    @Shadow @Final private String insertion;
+    @Shadow @Final private Identifier font;
+    @Unique private @Nullable RubyText ruby;
 
     @Invoker("<init>")
-    private static Style invokeConstructor(
+    private static @NotNull Style invokeConstructor(
         @Nullable TextColor color,
         @Nullable Integer shadowColor,
         @Nullable Boolean bold,
@@ -69,7 +43,9 @@ private static Style invokeConstructor(
         @Nullable HoverEvent hoverEvent,
         @Nullable String insertion,
         @Nullable Identifier font
-    ) {return null;}
+    ) {
+        return Style.EMPTY;
+    }
 
     @Shadow
     private static Style of(
@@ -84,12 +60,16 @@ private static Style of(
         Optional<HoverEvent> hoverEvent,
         Optional<String> insertion,
         Optional<Identifier> font
-    ) {return Style.EMPTY;}
+    ) {
+        return Style.EMPTY;
+    }
+
+    @Shadow
+    public abstract boolean equals(Object o);
 
     @Override
-    public Style withRuby(String word, String ruby) {
-        var newRuby = new RubyText(word, ruby);
-        var result = invokeConstructor(
+    public Style rubi$withRuby(String word, String ruby) {
+        var result = MixinStyle.invokeConstructor(
             this.color,
             this.shadowColor,
             this.bold,
@@ -102,18 +82,23 @@ public Style withRuby(String word, String ruby) {
             this.insertion,
             this.font
         );
-        ((MixinStyle) (Object) result).ruby = newRuby;
+        ((MixinStyle) (Object) result).setRuby(new RubyText(word, ruby, result));
         return result;
     }
 
     @Override
-    public @Nullable RubyText getRuby() {
+    public @Nullable RubyText rubi$getRuby() {
         return this.ruby;
     }
 
+    @Unique
+    private void setRuby(@Nullable RubyText ruby) {
+        this.ruby = ruby;
+    }
+
     @Override
-    public Style removeRuby() {
-        return of(
+    public Style rubi$removeRuby() {
+        return MixinStyle.of(
             Optional.ofNullable(this.color),
             Optional.ofNullable(this.shadowColor),
             Optional.ofNullable(this.bold),
@@ -131,13 +116,15 @@ public Style removeRuby() {
     @Inject(method = "withParent", at = @At("RETURN"))
     public void onWithParent(Style parent, CallbackInfoReturnable<Style> cir) {
         if (cir.getReturnValue() == parent) return;
-        if (((IRubyStyle) parent).getRuby() == null) return;
-        ((MixinStyle) (Object) cir.getReturnValue()).ruby = ((MixinStyle) (Object) parent).ruby;
+        if (IRubyStyle.getRuby(parent).isEmpty()) return;
+        ((MixinStyle) (Object) cir.getReturnValue()).setRuby(((IRubyStyle) parent).rubi$getRuby());
     }
 
     @Inject(method = "equals", at = @At("RETURN"), cancellable = true)
     public void onEquals(Object o, CallbackInfoReturnable<Boolean> cir) {
-        if (cir.getReturnValue()) cir.setReturnValue(Objects.equals(this.getRuby(), ((IRubyStyle) o).getRuby()));
+        if (cir.getReturnValue()) {
+            cir.setReturnValue(Objects.equals(this.ruby, ((IRubyStyle) o).rubi$getRuby()));
+        }
     }
 
     @Inject(method = "hashCode", at = @At("RETURN"), cancellable = true)
diff --git a/src/main/java/com/kevinsundqvistnorlen/rubi/mixin/client/MixinTextHandler.java b/src/main/java/com/kevinsundqvistnorlen/rubi/mixin/client/MixinTextHandler.java
index ac35470..91078c7 100644
--- a/src/main/java/com/kevinsundqvistnorlen/rubi/mixin/client/MixinTextHandler.java
+++ b/src/main/java/com/kevinsundqvistnorlen/rubi/mixin/client/MixinTextHandler.java
@@ -1,67 +1,63 @@
 package com.kevinsundqvistnorlen.rubi.mixin.client;
 
-import com.kevinsundqvistnorlen.rubi.*;
+import com.kevinsundqvistnorlen.rubi.IRubyStyle;
+import com.kevinsundqvistnorlen.rubi.Utils;
 import com.kevinsundqvistnorlen.rubi.option.ITextHandler;
 import net.minecraft.client.font.TextHandler;
 import net.minecraft.text.OrderedText;
 import net.minecraft.text.StringVisitable;
-import net.minecraft.text.Style;
 import org.apache.commons.lang3.mutable.MutableFloat;
-import org.apache.commons.lang3.mutable.MutableObject;
 import org.spongepowered.asm.mixin.*;
 import org.spongepowered.asm.mixin.injection.*;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(TextHandler.class)
 public abstract class MixinTextHandler implements ITextHandler {
+    @Shadow @Final TextHandler.WidthRetriever widthRetriever;
+    @Unique private volatile boolean getWidthMutex = false;
 
-    @Unique
-    private boolean getWidthMutex = false;
+    @ModifyVariable(method = "<init>", argsOnly = true, at = @At("LOAD"))
+    private static TextHandler.WidthRetriever modifyWidthRetrieverConstructor(
+        TextHandler.WidthRetriever widthRetriever
+    ) {
+        return (codePoint, style) -> IRubyStyle
+            .getRuby(style)
+            .map((rubyText -> rubyText.getWidth(widthRetriever)))
+            .orElseGet(() -> widthRetriever.getWidth(codePoint, style));
+    }
 
     @Shadow
-    public float getWidth(OrderedText text) { return 0f; }
+    public float getWidth(OrderedText text) {
+        return 0f;
+    }
 
-    @Inject(method = "getWidth(Ljava/lang/String;)F", at = @At("HEAD"), cancellable = true)
+    @Inject(
+        method = "getWidth(Ljava/lang/String;)F", at = @At("HEAD"), cancellable = true, order = 900
+    )
     public void injectGetWidth(String text, CallbackInfoReturnable<Float> info) {
-        onGetWidthOrderedText(Utils.orderedFrom(text), info);
+        this.onGetWidthOrderedText(Utils.orderedFrom(text), info);
     }
 
-    @Inject(method = "getWidth(Lnet/minecraft/text/StringVisitable;)F", at = @At("HEAD"), cancellable = true)
+    @Inject(
+        method = "getWidth(Lnet/minecraft/text/StringVisitable;)F", at = @At("HEAD"), cancellable = true, order = 900
+    )
     public void injectGetWidth(StringVisitable text, CallbackInfoReturnable<Float> info) {
-        onGetWidthOrderedText(Utils.orderedFrom(text), info);
+        this.onGetWidthOrderedText(Utils.orderedFrom(text), info);
     }
 
-    @Inject(method = "getWidth(Lnet/minecraft/text/OrderedText;)F", at = @At("HEAD"), cancellable = true)
+    @Inject(
+        method = "getWidth(Lnet/minecraft/text/OrderedText;)F", at = @At("HEAD"), cancellable = true, order = 900
+    )
     private void onGetWidthOrderedText(OrderedText text, CallbackInfoReturnable<Float> cir) {
-        if (!getWidthMutex) {
-            getWidthMutex = true;
+        if (!this.getWidthMutex) {
+            this.getWidthMutex = true;
             MutableFloat width = new MutableFloat();
-            Utils.splitWithDelimitersOrderedText(text, RubyText.RUBY_MARKER, orderedText -> {
-                if (orderedText == OrderedText.EMPTY) return;
-                width.add(this.getWidth(orderedText));
-            }, orderedText -> {
-                final MutableObject<RubyText> rubyTextWrapper = new MutableObject<>(null);
-                final MutableObject<Style> styleWrapper = new MutableObject<>(null);
-                orderedText.accept((index, style, codePoint) -> {
-                    if (rubyTextWrapper.getValue() != null) throw new IllegalStateException("Expected only one element in OrderedText rubiCharacter");
-                    if (codePoint != RubyText.RUBY_MARKER || IRubyStyle.getRuby(style) == null)
-                        throw new IllegalArgumentException("Expected rubi character");
-                    rubyTextWrapper.setValue(IRubyStyle.getRuby(style));
-                    styleWrapper.setValue(style);
-                    return true;
-                });
-                width.add(rubyTextWrapper.getValue().getWidth(this, styleWrapper.getValue()));
+            text.accept((index, style, codePoint) -> {
+                width.add(this.widthRetriever.getWidth(codePoint, style));
+                return true;
             });
             cir.setReturnValue(width.floatValue());
-            getWidthMutex = false;
+            this.getWidthMutex = false;
         }
     }
-
-    @ModifyVariable(method = "<init>", argsOnly = true, at = @At("LOAD"))
-    private static TextHandler.WidthRetriever modifyWidthRetrieverConstructor(TextHandler.WidthRetriever widthRetriever) {
-        return (codePoint, style) ->
-            codePoint == RubyText.RUBY_MARKER && ((IRubyStyle) style).getRuby() != null ?
-                ((IRubyStyle) style).getRuby().getWidth(widthRetriever, style) :
-                widthRetriever.getWidth(codePoint, style);
-    }
 }
diff --git a/src/main/java/com/kevinsundqvistnorlen/rubi/mixin/client/MixinTextRenderer.java b/src/main/java/com/kevinsundqvistnorlen/rubi/mixin/client/MixinTextRenderer.java
index 099b11d..87fc74c 100644
--- a/src/main/java/com/kevinsundqvistnorlen/rubi/mixin/client/MixinTextRenderer.java
+++ b/src/main/java/com/kevinsundqvistnorlen/rubi/mixin/client/MixinTextRenderer.java
@@ -1,28 +1,23 @@
 package com.kevinsundqvistnorlen.rubi.mixin.client;
 
-import com.kevinsundqvistnorlen.rubi.*;
-import net.minecraft.client.font.*;
+import com.kevinsundqvistnorlen.rubi.TextDrawer;
+import com.kevinsundqvistnorlen.rubi.Utils;
+import net.minecraft.client.font.TextHandler;
+import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.text.OrderedText;
 import org.joml.Math;
-import org.joml.*;
+import org.joml.Matrix4f;
 import org.spongepowered.asm.mixin.*;
 import org.spongepowered.asm.mixin.injection.*;
-import org.spongepowered.asm.mixin.injection.callback.*;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(TextRenderer.class)
 public abstract class MixinTextRenderer {
-
-    @Final
-    @Shadow
-    public int fontHeight;
-
-    @Final
-    @Shadow
-    private TextHandler handler;
-
-    @Unique
-    private boolean isSeparatingDrawCall = false;
+    @Final @Shadow public int fontHeight;
+    @Final @Shadow private TextHandler handler;
+    @Unique private boolean isSeparatingDrawCall = false;
 
     @Shadow
     public abstract int draw(
@@ -52,13 +47,12 @@ public abstract void drawWithOutline(
 
     @Redirect(
         method = "draw(Ljava/lang/String;FFIZLorg/joml/Matrix4f;Lnet/minecraft/client/render/VertexConsumerProvider;" +
-            "Lnet/minecraft/client/font/TextRenderer$TextLayerType;II)I",
-        at = @At(
-            value = "INVOKE",
-            target = "Lnet/minecraft/client/font/TextRenderer;drawInternal(Ljava/lang/String;FFIZLorg/joml/Matrix4f;" +
-                "Lnet/minecraft/client/render/VertexConsumerProvider;" +
-                "Lnet/minecraft/client/font/TextRenderer$TextLayerType;IIZ)I"
-        )
+            "Lnet/minecraft/client/font/TextRenderer$TextLayerType;II)I", at = @At(
+        value = "INVOKE",
+        target = "Lnet/minecraft/client/font/TextRenderer;drawInternal(Ljava/lang/String;FFIZLorg/joml/Matrix4f;" +
+            "Lnet/minecraft/client/render/VertexConsumerProvider;" +
+            "Lnet/minecraft/client/font/TextRenderer$TextLayerType;IIZ)I"
+    )
     )
     public int redirectDraw(
         TextRenderer textRenderer,
@@ -91,9 +85,7 @@ public int redirectDraw(
     @Inject(
         method = "draw(Lnet/minecraft/text/OrderedText;FFIZLorg/joml/Matrix4f;" +
             "Lnet/minecraft/client/render/VertexConsumerProvider;" +
-            "Lnet/minecraft/client/font/TextRenderer$TextLayerType;II)I",
-        at = @At("HEAD"),
-        cancellable = true
+            "Lnet/minecraft/client/font/TextRenderer$TextLayerType;II)I", at = @At("HEAD"), cancellable = true
     )
     public void injectDraw(
         OrderedText text,
@@ -108,16 +100,10 @@ public void injectDraw(
         int light,
         CallbackInfoReturnable<Integer> info
     ) {
-        if (!isSeparatingDrawCall) {
-            isSeparatingDrawCall = true;
-            int advance = TextDrawer.draw(
-                text,
-                x,
-                y,
-                matrix,
-                this.handler,
-                this.fontHeight,
-                (t, xx, yy, m) -> this.draw(
+        if (!this.isSeparatingDrawCall) {
+            this.isSeparatingDrawCall = true;
+            int advance =
+                TextDrawer.draw(text, x, y, matrix, this.handler, this.fontHeight, (t, xx, yy, m) -> this.draw(
                     t,
                     Math.round(xx),
                     Math.round(yy),
@@ -128,9 +114,8 @@ public void injectDraw(
                     layerType,
                     backgroundColor,
                     light
-                )
-            );
-            isSeparatingDrawCall = false;
+                ));
+            this.isSeparatingDrawCall = false;
             info.setReturnValue(advance);
         }
     }
@@ -147,8 +132,8 @@ public void injectDrawWithOutline(
         int light,
         CallbackInfo info
     ) {
-        if (!isSeparatingDrawCall) {
-            isSeparatingDrawCall = true;
+        if (!this.isSeparatingDrawCall) {
+            this.isSeparatingDrawCall = true;
             TextDrawer.draw(
                 text,
                 x,
@@ -159,7 +144,7 @@ public void injectDrawWithOutline(
                 (t, xx, yy, m) -> this.drawWithOutline(t, xx, yy, color, outlineColor, m, vertexConsumers, light)
             );
             info.cancel();
-            isSeparatingDrawCall = false;
+            this.isSeparatingDrawCall = false;
         }
     }
 }
diff --git a/src/main/java/com/kevinsundqvistnorlen/rubi/mixin/client/MixinTextVisitFactory.java b/src/main/java/com/kevinsundqvistnorlen/rubi/mixin/client/MixinTextVisitFactory.java
index cb0b967..8d1e159 100644
--- a/src/main/java/com/kevinsundqvistnorlen/rubi/mixin/client/MixinTextVisitFactory.java
+++ b/src/main/java/com/kevinsundqvistnorlen/rubi/mixin/client/MixinTextVisitFactory.java
@@ -3,18 +3,17 @@
 import com.kevinsundqvistnorlen.rubi.IRubyStyle;
 import com.kevinsundqvistnorlen.rubi.RubyText;
 import com.llamalad7.mixinextras.sugar.Local;
-import net.minecraft.text.CharacterVisitor;
-import net.minecraft.text.Style;
-import net.minecraft.text.TextVisitFactory;
+import net.minecraft.text.*;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.*;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(TextVisitFactory.class)
 public class MixinTextVisitFactory {
-
     @Inject(
-        method = "visitFormatted(Ljava/lang/String;ILnet/minecraft/text/Style;Lnet/minecraft/text/Style;Lnet/minecraft/text/CharacterVisitor;)Z",
+        method = "visitFormatted(Ljava/lang/String;ILnet/minecraft/text/Style;Lnet/minecraft/text/Style;" +
+            "Lnet/minecraft/text/CharacterVisitor;)Z",
         at = @At(value = "INVOKE", target = "Lnet/minecraft/util/Formatting;byCode(C)Lnet/minecraft/util/Formatting;"),
         cancellable = true
     )
@@ -34,8 +33,7 @@ private static void onFormattingCode(
             if (matcher.find(index)) {
                 final var word = matcher.group(1);
                 final var ruby = matcher.group(2);
-                final IRubyStyle s = (IRubyStyle) style;
-                if (!visitor.accept(index, s.withRuby(word, ruby), RubyText.RUBY_MARKER)) {
+                if (!visitor.accept(index, ((IRubyStyle) style).rubi$withRuby(word, ruby), '')) {
                     cir.setReturnValue(false);
                     return;
                 }
@@ -44,5 +42,4 @@ private static void onFormattingCode(
             }
         }
     }
-
 }
diff --git a/src/main/java/com/kevinsundqvistnorlen/rubi/option/ITextHandler.java b/src/main/java/com/kevinsundqvistnorlen/rubi/option/ITextHandler.java
index f3ddb56..45b1453 100644
--- a/src/main/java/com/kevinsundqvistnorlen/rubi/option/ITextHandler.java
+++ b/src/main/java/com/kevinsundqvistnorlen/rubi/option/ITextHandler.java
@@ -2,8 +2,7 @@
 
 import net.minecraft.text.OrderedText;
 
+@FunctionalInterface
 public interface ITextHandler {
-
     float getWidth(OrderedText text);
-
 }
diff --git a/src/main/java/com/kevinsundqvistnorlen/rubi/option/RubyRenderMode.java b/src/main/java/com/kevinsundqvistnorlen/rubi/option/RubyRenderMode.java
index 1266183..73600b8 100644
--- a/src/main/java/com/kevinsundqvistnorlen/rubi/option/RubyRenderMode.java
+++ b/src/main/java/com/kevinsundqvistnorlen/rubi/option/RubyRenderMode.java
@@ -2,7 +2,8 @@
 
 import com.kevinsundqvistnorlen.rubi.Utils;
 import com.mojang.serialization.Codec;
-import net.minecraft.client.option.*;
+import net.minecraft.client.option.GameOptions;
+import net.minecraft.client.option.SimpleOption;
 import net.minecraft.util.TranslatableOption;
 
 import java.util.Arrays;
@@ -43,18 +44,19 @@ public String getTranslationKey() {
 
     private static final class Option {
         static final String TRANSLATION_KEY = "options.rubi.renderMode";
-        static final SimpleOption<RubyRenderMode> INSTANCE = new SimpleOption<>(
-            TRANSLATION_KEY,
-            SimpleOption.emptyTooltip(),
-            SimpleOption.enumValueText(),
-            new SimpleOption.PotentialValuesBasedCallbacks<>(
-                Arrays.asList(RubyRenderMode.values()),
-                Codec.INT.xmap(RubyRenderMode::byId, RubyRenderMode::getId)
-            ),
-            RubyRenderMode.ABOVE,
-            (value) -> {
-                Utils.LOGGER.debug("Ruby display mode changed to {} ({})", value.toString(), value.ordinal());
-            }
-        );
+        static final SimpleOption<RubyRenderMode> INSTANCE =
+            new SimpleOption<>(
+                TRANSLATION_KEY,
+                SimpleOption.emptyTooltip(),
+                SimpleOption.enumValueText(),
+                new SimpleOption.PotentialValuesBasedCallbacks<>(
+                    Arrays.asList(RubyRenderMode.values()),
+                    Codec.INT.xmap(RubyRenderMode::byId, RubyRenderMode::getId)
+                ),
+                RubyRenderMode.ABOVE,
+                (value) ->
+                    Utils.LOGGER.debug(
+                        "Ruby display mode changed to {} ({})", value.toString(), value.ordinal())
+            );
     }
 }
diff --git a/src/main/resources/rubi.mixins.json b/src/main/resources/rubi.mixins.json
index bd9dcb8..446c3d6 100644
--- a/src/main/resources/rubi.mixins.json
+++ b/src/main/resources/rubi.mixins.json
@@ -1,17 +1,17 @@
 {
-  "required": true,
-  "package": "com.kevinsundqvistnorlen.rubi.mixin.client",
-  "compatibilityLevel": "JAVA_17",
-  "client": [
-    "MixinAccessibilityOptionsScreen",
-    "MixinGameOptions",
-    "MixinStringVisitable",
-    "MixinStyle",
-    "MixinTextHandler",
-    "MixinTextRenderer",
-    "MixinTextVisitFactory"
-  ],
-  "injectors": {
-    "defaultRequire": 1
-  }
+    "required": true,
+    "package": "com.kevinsundqvistnorlen.rubi.mixin.client",
+    "compatibilityLevel": "JAVA_17",
+    "client": [
+        "MixinAccessibilityOptionsScreen",
+        "MixinGameOptions",
+        "MixinStringVisitable",
+        "MixinStyle",
+        "MixinTextHandler",
+        "MixinTextRenderer",
+        "MixinTextVisitFactory"
+    ],
+    "injectors": {
+        "defaultRequire": 1
+    }
 }