diff --git a/tools/build/bazel/publish_catalog.bzl b/tools/build/bazel/publish_catalog.bzl
index ef277e8..edf9569 100644
--- a/tools/build/bazel/publish_catalog.bzl
+++ b/tools/build/bazel/publish_catalog.bzl
@@ -8,7 +8,7 @@
 def _remote(group_id, artifact_id, version, packaging, classifier):
     p = group_id.replace(".", "/") + "/" + artifact_id + "/" + version + "/" + artifact_id + "-" + version
     if classifier != None:
-      p += "-" + classifier
+        p += "-" + classifier
     p += "." + packaging
     return p
 
@@ -26,15 +26,15 @@
 
     c = artifact_id.split("-")
 
-    if len(c) > 1 and c[len(c)-1] in ("javadoc", "sources", "tests", "pom"):
-        classifier = c[len(c)-1]
-        artifact_id = "-".join(c[:len(c)-1])
+    if len(c) > 1 and c[len(c) - 1] in ("javadoc", "sources", "tests", "pom"):
+        classifier = c[len(c) - 1]
+        artifact_id = "-".join(c[:len(c) - 1])
         if classifier == "pom":
             packaging = classifier
             classifier = None
 
     for f in target.files:
-        print ("%s\t%s" % (f.path, _remote(group_id, artifact_id, version, packaging, classifier)))
+        print("%s\t%s" % (f.path, _remote(group_id, artifact_id, version, packaging, classifier)))
     return []
 
 publish_catalog = aspect(
