diff --git a/barcode/__init__.py b/barcode/__init__.py
index c43c578..1879742 100755
--- a/barcode/__init__.py
+++ b/barcode/__init__.py
@@ -115,8 +115,7 @@ def generate(
     barcode = get(name, code, writer)
 
     if isinstance(output, str):
-        fullname = barcode.save(output, writer_options, text)
-        return fullname
+        return barcode.save(output, writer_options, text)
     if output:
         barcode.write(output, writer_options, text)
         return None
diff --git a/barcode/codex.py b/barcode/codex.py
index b594e01..152f572 100755
--- a/barcode/codex.py
+++ b/barcode/codex.py
@@ -237,8 +237,7 @@ def _build(self):
             encoded.extend(self._new_charset("B"))
             encoded.append(self._convert(self._buffer[0]))
             self._buffer = ""
-        encoded = self._try_to_optimize(encoded)
-        return encoded
+        return self._try_to_optimize(encoded)
 
     def build(self):
         encoded = self._build()