diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
index 3f1550e..525a206 100644
--- a/WORKSPACE.bazel
+++ b/WORKSPACE.bazel
@@ -4,10 +4,10 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_jar")
 
 http_archive(
     name = "rules_java",
+    sha256 = "a1f82b730b9c6395d3653032bd7e3a660f9d5ddb1099f427c1e1fe768f92e395",
     urls = [
         "https://github.com/bazelbuild/rules_java/releases/download/5.4.1/rules_java-5.4.1.tar.gz",
     ],
-    sha256 = "a1f82b730b9c6395d3653032bd7e3a660f9d5ddb1099f427c1e1fe768f92e395",
 )
 
 load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains")
diff --git a/antlr/BUILD.bazel b/antlr/BUILD.bazel
index 248cb80..20d971c 100644
--- a/antlr/BUILD.bazel
+++ b/antlr/BUILD.bazel
@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_stardoc//stardoc:stardoc.bzl", "stardoc")
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+load("@io_bazel_stardoc//stardoc:stardoc.bzl", "stardoc")
+
+package(default_visibility = ["//visibility:public"])
 
 filegroup(
     name = "srcs",
diff --git a/examples/WORKSPACE.bazel b/examples/WORKSPACE.bazel
index 33311eb..a7bcfb9 100644
--- a/examples/WORKSPACE.bazel
+++ b/examples/WORKSPACE.bazel
@@ -9,11 +9,11 @@ local_repository(
 
 http_archive(
     name = "platforms",
+    sha256 = "218efe8ee736d26a3572663b374a253c012b716d8af0c07e842e82f238a0a7ee",
     urls = [
         "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.10/platforms-0.0.10.tar.gz",
         "https://github.com/bazelbuild/platforms/releases/download/0.0.10/platforms-0.0.10.tar.gz",
     ],
-    sha256 = "218efe8ee736d26a3572663b374a253c012b716d8af0c07e842e82f238a0a7ee",
 )
 
 http_archive(
diff --git a/examples/antlr2/Calc/src/main/antlr2/BUILD.bazel b/examples/antlr2/Calc/src/main/antlr2/BUILD.bazel
index 01f0b1d..4b79549 100644
--- a/examples/antlr2/Calc/src/main/antlr2/BUILD.bazel
+++ b/examples/antlr2/Calc/src/main/antlr2/BUILD.bazel
@@ -1,9 +1,8 @@
+load("@rules_antlr//antlr:antlr2.bzl", "antlr")
 load("@rules_java//java:defs.bzl", "java_library")
 
 package(default_visibility = ["//visibility:public"])
 
-load("@rules_antlr//antlr:antlr2.bzl", "antlr")
-
 antlr(
     name = "generated",
     srcs = ["calc.g"],
diff --git a/examples/antlr2/InheritTinyC/src/main/antlr2/BUILD.bazel b/examples/antlr2/InheritTinyC/src/main/antlr2/BUILD.bazel
index 210ee23..24cb1c6 100644
--- a/examples/antlr2/InheritTinyC/src/main/antlr2/BUILD.bazel
+++ b/examples/antlr2/InheritTinyC/src/main/antlr2/BUILD.bazel
@@ -1,9 +1,8 @@
+load("@rules_antlr//antlr:antlr2.bzl", "antlr")
 load("@rules_java//java:defs.bzl", "java_library")
 
 package(default_visibility = ["//visibility:public"])
 
-load("@rules_antlr//antlr:antlr2.bzl", "antlr")
-
 antlr(
     name = "generated",
     srcs = ["subc.g"],
diff --git a/examples/antlr2/TinyC/src/main/antlr2/BUILD.bazel b/examples/antlr2/TinyC/src/main/antlr2/BUILD.bazel
index 5645ee4..fabb18a 100644
--- a/examples/antlr2/TinyC/src/main/antlr2/BUILD.bazel
+++ b/examples/antlr2/TinyC/src/main/antlr2/BUILD.bazel
@@ -1,9 +1,8 @@
+load("@rules_antlr//antlr:antlr2.bzl", "antlr")
 load("@rules_java//java:defs.bzl", "java_library")
 
 package(default_visibility = ["//visibility:public"])
 
-load("@rules_antlr//antlr:antlr2.bzl", "antlr")
-
 filegroup(
     name = "srcs",
     srcs = [
diff --git a/examples/antlr3/DetectLanguage/src/main/antlr3/BUILD.bazel b/examples/antlr3/DetectLanguage/src/main/antlr3/BUILD.bazel
index 9cc4dff..00370f8 100644
--- a/examples/antlr3/DetectLanguage/src/main/antlr3/BUILD.bazel
+++ b/examples/antlr3/DetectLanguage/src/main/antlr3/BUILD.bazel
@@ -1,9 +1,8 @@
+load("@rules_antlr//antlr:antlr3.bzl", "antlr")
 load("@rules_java//java:defs.bzl", "java_library")
 
 package(default_visibility = ["//visibility:public"])
 
-load("@rules_antlr//antlr:antlr3.bzl", "antlr")
-
 antlr(
     name = "csharp",
     srcs = ["T.g"],
diff --git a/examples/antlr3/InheritLibFolder/src/main/antlr3/BUILD.bazel b/examples/antlr3/InheritLibFolder/src/main/antlr3/BUILD.bazel
index 2a0b756..3b0431b 100644
--- a/examples/antlr3/InheritLibFolder/src/main/antlr3/BUILD.bazel
+++ b/examples/antlr3/InheritLibFolder/src/main/antlr3/BUILD.bazel
@@ -1,9 +1,8 @@
+load("@rules_antlr//antlr:antlr3.bzl", "antlr", "imports")
 load("@rules_java//java:defs.bzl", "java_library")
 
 package(default_visibility = ["//visibility:public"])
 
-load("@rules_antlr//antlr:antlr3.bzl", "antlr", "imports")
-
 antlr(
     name = "generated",
     srcs = ["Simple.g"],
diff --git a/examples/antlr3/InheritSameFolder/src/main/antlr3/BUILD.bazel b/examples/antlr3/InheritSameFolder/src/main/antlr3/BUILD.bazel
index 1a69d86..b5c58c5 100644
--- a/examples/antlr3/InheritSameFolder/src/main/antlr3/BUILD.bazel
+++ b/examples/antlr3/InheritSameFolder/src/main/antlr3/BUILD.bazel
@@ -1,9 +1,8 @@
+load("@rules_antlr//antlr:antlr3.bzl", "antlr")
 load("@rules_java//java:defs.bzl", "java_library")
 
 package(default_visibility = ["//visibility:public"])
 
-load("@rules_antlr//antlr:antlr3.bzl", "antlr")
-
 antlr(
     name = "generated",
     srcs = glob(["*.g"]),
diff --git a/examples/antlr3/Java/src/main/antlr3/BUILD.bazel b/examples/antlr3/Java/src/main/antlr3/BUILD.bazel
index 02cd96e..d84ae71 100644
--- a/examples/antlr3/Java/src/main/antlr3/BUILD.bazel
+++ b/examples/antlr3/Java/src/main/antlr3/BUILD.bazel
@@ -1,9 +1,8 @@
+load("@rules_antlr//antlr:antlr3.bzl", "antlr")
 load("@rules_java//java:defs.bzl", "java_library")
 
 package(default_visibility = ["//visibility:public"])
 
-load("@rules_antlr//antlr:antlr3.bzl", "antlr")
-
 antlr(
     name = "generated",
     srcs = ["SimpleC.g"],
diff --git a/examples/antlr3/LanguageByAttribute/src/main/antlr3/BUILD.bazel b/examples/antlr3/LanguageByAttribute/src/main/antlr3/BUILD.bazel
index 1b53c16..3615818 100644
--- a/examples/antlr3/LanguageByAttribute/src/main/antlr3/BUILD.bazel
+++ b/examples/antlr3/LanguageByAttribute/src/main/antlr3/BUILD.bazel
@@ -1,9 +1,8 @@
+load("@rules_antlr//antlr:antlr3.bzl", "antlr")
 load("@rules_java//java:defs.bzl", "java_library")
 
 package(default_visibility = ["//visibility:public"])
 
-load("@rules_antlr//antlr:antlr3.bzl", "antlr")
-
 antlr(
     name = "generated",
     srcs = ["SimpleC.g"],
diff --git a/examples/antlr3/ObjC/src/BUILD.bazel b/examples/antlr3/ObjC/src/BUILD.bazel
index 9f15510..c6a12fb 100644
--- a/examples/antlr3/ObjC/src/BUILD.bazel
+++ b/examples/antlr3/ObjC/src/BUILD.bazel
@@ -5,4 +5,3 @@ antlr(
     srcs = glob(["SimpleC.g"]),
     language = "ObjC",
 )
-
diff --git a/examples/antlr3/Python2/src/BUILD.bazel b/examples/antlr3/Python2/src/BUILD.bazel
index 86dd77d..d8fd10e 100644
--- a/examples/antlr3/Python2/src/BUILD.bazel
+++ b/examples/antlr3/Python2/src/BUILD.bazel
@@ -1,5 +1,5 @@
-load("@rules_python//python:defs.bzl", "py_binary", "py_library")
 load("@rules_antlr//antlr:antlr3.bzl", "antlr")
+load("@rules_python//python:defs.bzl", "py_binary", "py_library")
 
 antlr(
     name = "generated",
diff --git a/examples/antlr3/Python3/src/BUILD.bazel b/examples/antlr3/Python3/src/BUILD.bazel
index eb95b9d..8cae4aa 100644
--- a/examples/antlr3/Python3/src/BUILD.bazel
+++ b/examples/antlr3/Python3/src/BUILD.bazel
@@ -1,5 +1,5 @@
-load("@rules_python//python:defs.bzl", "py_binary", "py_library")
 load("@rules_antlr//antlr:antlr3.bzl", "antlr")
+load("@rules_python//python:defs.bzl", "py_binary", "py_library")
 
 antlr(
     name = "generated",
diff --git a/examples/antlr4-opt/Hello/src/main/antlr4/BUILD.bazel b/examples/antlr4-opt/Hello/src/main/antlr4/BUILD.bazel
index d3e305a..cc72747 100644
--- a/examples/antlr4-opt/Hello/src/main/antlr4/BUILD.bazel
+++ b/examples/antlr4-opt/Hello/src/main/antlr4/BUILD.bazel
@@ -1,9 +1,8 @@
+load("@rules_antlr//antlr:antlr4.bzl", "antlr")
 load("@rules_java//java:defs.bzl", "java_library")
 
 package(default_visibility = ["//visibility:public"])
 
-load("@rules_antlr//antlr:antlr4.bzl", "antlr")
-
 antlr(
     name = "generated",
     srcs = ["Hello.g4"],
diff --git a/examples/antlr4/Cpp/src/antlr4/BUILD.bazel b/examples/antlr4/Cpp/src/antlr4/BUILD.bazel
index 392e57f..5094d6e 100644
--- a/examples/antlr4/Cpp/src/antlr4/BUILD.bazel
+++ b/examples/antlr4/Cpp/src/antlr4/BUILD.bazel
@@ -1,5 +1,5 @@
-load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@rules_antlr//antlr:antlr4.bzl", "antlr")
+load("@rules_cc//cc:defs.bzl", "cc_library")
 
 antlr(
     name = "generated",
diff --git a/examples/antlr4/CustomLayout/src/antlrgrammars/foo/bar/BUILD.bazel b/examples/antlr4/CustomLayout/src/antlrgrammars/foo/bar/BUILD.bazel
index 1061c42..35802f4 100644
--- a/examples/antlr4/CustomLayout/src/antlrgrammars/foo/bar/BUILD.bazel
+++ b/examples/antlr4/CustomLayout/src/antlrgrammars/foo/bar/BUILD.bazel
@@ -1,9 +1,8 @@
+load("@rules_antlr//antlr:antlr4.bzl", "antlr")
 load("@rules_java//java:defs.bzl", "java_library")
 
 package(default_visibility = ["//visibility:public"])
 
-load("@rules_antlr//antlr:antlr4.bzl", "antlr")
-
 antlr(
     name = "generated",
     srcs = ["Hello.g4"],
diff --git a/examples/antlr4/DetectLanguage/src/main/antlr4/BUILD.bazel b/examples/antlr4/DetectLanguage/src/main/antlr4/BUILD.bazel
index 9d52b1f..22f7146 100644
--- a/examples/antlr4/DetectLanguage/src/main/antlr4/BUILD.bazel
+++ b/examples/antlr4/DetectLanguage/src/main/antlr4/BUILD.bazel
@@ -1,9 +1,8 @@
+load("@rules_antlr//antlr:antlr4.bzl", "antlr")
 load("@rules_java//java:defs.bzl", "java_library")
 
 package(default_visibility = ["//visibility:public"])
 
-load("@rules_antlr//antlr:antlr4.bzl", "antlr")
-
 antlr(
     name = "cpp",
     srcs = glob(["cpp/*.g4"]),
diff --git a/examples/antlr4/Go/src/BUILD.bazel b/examples/antlr4/Go/src/BUILD.bazel
index c6d7410..0336a58 100644
--- a/examples/antlr4/Go/src/BUILD.bazel
+++ b/examples/antlr4/Go/src/BUILD.bazel
@@ -1,5 +1,5 @@
-load("@rules_antlr//antlr:antlr4.bzl", "antlr")
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
+load("@rules_antlr//antlr:antlr4.bzl", "antlr")
 
 antlr(
     name = "generated",
diff --git a/examples/antlr4/InheritLibFolder/src/main/antlr4/BUILD.bazel b/examples/antlr4/InheritLibFolder/src/main/antlr4/BUILD.bazel
index 7671b7a..79e9c5e 100644
--- a/examples/antlr4/InheritLibFolder/src/main/antlr4/BUILD.bazel
+++ b/examples/antlr4/InheritLibFolder/src/main/antlr4/BUILD.bazel
@@ -1,9 +1,8 @@
+load("@rules_antlr//antlr:antlr4.bzl", "antlr", "imports")
 load("@rules_java//java:defs.bzl", "java_library")
 
 package(default_visibility = ["//visibility:public"])
 
-load("@rules_antlr//antlr:antlr4.bzl", "antlr", "imports")
-
 antlr(
     name = "generated",
     srcs = glob(["*.g4"]),
diff --git a/examples/antlr4/InheritSameFolder/src/main/antlr4/BUILD.bazel b/examples/antlr4/InheritSameFolder/src/main/antlr4/BUILD.bazel
index 0db2d49..39e8a29 100644
--- a/examples/antlr4/InheritSameFolder/src/main/antlr4/BUILD.bazel
+++ b/examples/antlr4/InheritSameFolder/src/main/antlr4/BUILD.bazel
@@ -1,9 +1,8 @@
+load("@rules_antlr//antlr:antlr4.bzl", "antlr")
 load("@rules_java//java:defs.bzl", "java_library")
 
 package(default_visibility = ["//visibility:public"])
 
-load("@rules_antlr//antlr:antlr4.bzl", "antlr")
-
 antlr(
     name = "generated",
     srcs = glob(["*.g4"]),
diff --git a/examples/antlr4/Java/src/main/antlr4/BUILD.bazel b/examples/antlr4/Java/src/main/antlr4/BUILD.bazel
index d3e305a..cc72747 100644
--- a/examples/antlr4/Java/src/main/antlr4/BUILD.bazel
+++ b/examples/antlr4/Java/src/main/antlr4/BUILD.bazel
@@ -1,9 +1,8 @@
+load("@rules_antlr//antlr:antlr4.bzl", "antlr")
 load("@rules_java//java:defs.bzl", "java_library")
 
 package(default_visibility = ["//visibility:public"])
 
-load("@rules_antlr//antlr:antlr4.bzl", "antlr")
-
 antlr(
     name = "generated",
     srcs = ["Hello.g4"],
diff --git a/examples/antlr4/LanguageByAttribute/src/main/antlr4/override/BUILD.bazel b/examples/antlr4/LanguageByAttribute/src/main/antlr4/override/BUILD.bazel
index 5c272e8..0d9f966 100644
--- a/examples/antlr4/LanguageByAttribute/src/main/antlr4/override/BUILD.bazel
+++ b/examples/antlr4/LanguageByAttribute/src/main/antlr4/override/BUILD.bazel
@@ -1,9 +1,8 @@
+load("@rules_antlr//antlr:antlr4.bzl", "antlr")
 load("@rules_java//java:defs.bzl", "java_library")
 
 package(default_visibility = ["//visibility:public"])
 
-load("@rules_antlr//antlr:antlr4.bzl", "antlr")
-
 antlr(
     name = "cpp",
     srcs = glob(["**/*.g4"]),
diff --git a/examples/antlr4/LanguageByOption/src/main/antlr4/BUILD.bazel b/examples/antlr4/LanguageByOption/src/main/antlr4/BUILD.bazel
index f26a6ff..a31ffd6 100644
--- a/examples/antlr4/LanguageByOption/src/main/antlr4/BUILD.bazel
+++ b/examples/antlr4/LanguageByOption/src/main/antlr4/BUILD.bazel
@@ -1,9 +1,8 @@
+load("@rules_antlr//antlr:antlr4.bzl", "antlr")
 load("@rules_java//java:defs.bzl", "java_library")
 
 package(default_visibility = ["//visibility:public"])
 
-load("@rules_antlr//antlr:antlr4.bzl", "antlr")
-
 antlr(
     name = "generated",
     srcs = ["Hello.g4"],
diff --git a/examples/antlr4/NamespaceByAttribute/src/main/antlr4/foo/bar/BUILD.bazel b/examples/antlr4/NamespaceByAttribute/src/main/antlr4/foo/bar/BUILD.bazel
index e8aeb99..475c807 100644
--- a/examples/antlr4/NamespaceByAttribute/src/main/antlr4/foo/bar/BUILD.bazel
+++ b/examples/antlr4/NamespaceByAttribute/src/main/antlr4/foo/bar/BUILD.bazel
@@ -1,9 +1,8 @@
+load("@rules_antlr//antlr:antlr4.bzl", "antlr")
 load("@rules_java//java:defs.bzl", "java_library")
 
 package(default_visibility = ["//visibility:public"])
 
-load("@rules_antlr//antlr:antlr4.bzl", "antlr")
-
 antlr(
     name = "generated",
     srcs = ["Hello.g4"],
diff --git a/examples/antlr4/NamespaceByConvention/src/main/antlr4/foo/bar/BUILD.bazel b/examples/antlr4/NamespaceByConvention/src/main/antlr4/foo/bar/BUILD.bazel
index c546b40..fe32e81 100644
--- a/examples/antlr4/NamespaceByConvention/src/main/antlr4/foo/bar/BUILD.bazel
+++ b/examples/antlr4/NamespaceByConvention/src/main/antlr4/foo/bar/BUILD.bazel
@@ -1,9 +1,8 @@
+load("@rules_antlr//antlr:antlr4.bzl", "antlr")
 load("@rules_java//java:defs.bzl", "java_library")
 
 package(default_visibility = ["//visibility:public"])
 
-load("@rules_antlr//antlr:antlr4.bzl", "antlr")
-
 antlr(
     name = "generated",
     srcs = ["Hello.g4"],
diff --git a/examples/antlr4/NamespaceByGrammar/src/main/antlr4/BUILD.bazel b/examples/antlr4/NamespaceByGrammar/src/main/antlr4/BUILD.bazel
index cd2b8bd..7e1ecbb 100644
--- a/examples/antlr4/NamespaceByGrammar/src/main/antlr4/BUILD.bazel
+++ b/examples/antlr4/NamespaceByGrammar/src/main/antlr4/BUILD.bazel
@@ -1,9 +1,8 @@
+load("@rules_antlr//antlr:antlr4.bzl", "antlr")
 load("@rules_java//java:defs.bzl", "java_library")
 
 package(default_visibility = ["//visibility:public"])
 
-load("@rules_antlr//antlr:antlr4.bzl", "antlr")
-
 antlr(
     name = "generated",
     srcs = ["Hello.g4"],
diff --git a/examples/antlr4/NamespaceGrammarOverConvention/src/main/antlr4/foo/bar/BUILD.bazel b/examples/antlr4/NamespaceGrammarOverConvention/src/main/antlr4/foo/bar/BUILD.bazel
index 002e619..e304e47 100644
--- a/examples/antlr4/NamespaceGrammarOverConvention/src/main/antlr4/foo/bar/BUILD.bazel
+++ b/examples/antlr4/NamespaceGrammarOverConvention/src/main/antlr4/foo/bar/BUILD.bazel
@@ -1,9 +1,8 @@
+load("@rules_antlr//antlr:antlr4.bzl", "antlr")
 load("@rules_java//java:defs.bzl", "java_library")
 
 package(default_visibility = ["//visibility:public"])
 
-load("@rules_antlr//antlr:antlr4.bzl", "antlr")
-
 antlr(
     name = "generated",
     srcs = ["Hello.g4"],
diff --git a/src/test/java/org/antlr/bazel/BUILD.bazel b/src/test/java/org/antlr/bazel/BUILD.bazel
index 8c35243..33355e2 100644
--- a/src/test/java/org/antlr/bazel/BUILD.bazel
+++ b/src/test/java/org/antlr/bazel/BUILD.bazel
@@ -1,9 +1,8 @@
 load("@rules_java//java:defs.bzl", "java_library")
+load("//tools:gen_test_rules.bzl", "java_tests")
 
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:gen_test_rules.bzl", "java_tests")
-
 java_library(
     name = "tests",
     srcs = glob(["*.java"]),