diff --git a/flacinfo.py b/flacinfo.py
index 71f737d..e676ab2 100755
--- a/flacinfo.py
+++ b/flacinfo.py
@@ -38,11 +38,11 @@ class NoSuchTag(Exception):
 
 
 class MetaflacError(Exception):
-    """ Raised when an invocation of metaflac failed. """
+    """Raised when an invocation of metaflac failed."""
 
 
 def argparser():
-    """ Parses the arguments from sys.argv """
+    """Parses the arguments from sys.argv"""
     parser = argparse.ArgumentParser(
         description="Edit flac files' metadata",
         epilog=(
@@ -66,7 +66,7 @@ def argparser():
 
 
 def is_flac_file(path):
-    """ Checks whether `path` refers to an existing, writeable flac file """
+    """Checks whether `path` refers to an existing, writeable flac file"""
     if not os.path.isfile(path) or not os.access(path, os.W_OK):
         return False
     try:
@@ -92,13 +92,14 @@ def make_metaflac_args(in_args):
         arg_name = VORBIS_ARG_NAME[arg]
 
         out_args.append("--remove-tag={}".format(arg_name))
-        out_args.append("--set-tag={}={}".format(arg_name, arg_val))
+        if arg_val:
+            out_args.append("--set-tag={}={}".format(arg_name, arg_val))
 
     return out_args
 
 
 def edit_flac(args):
-    """ Perfoms the requested edition operations """
+    """Perfoms the requested edition operations"""
     metaflac_args = make_metaflac_args(args)
     metaflac_args += args["file"]
     metaflac_args.insert(0, "metaflac")
@@ -113,7 +114,7 @@ def edit_flac(args):
 
 
 def reverse_tag(vorbis_tag):
-    """ Reverses a Vorbis tag to an argument name """
+    """Reverses a Vorbis tag to an argument name"""
     for tag in VORBIS_ARG_NAME:
         if VORBIS_ARG_NAME[tag] == vorbis_tag:
             return tag
@@ -121,7 +122,7 @@ def reverse_tag(vorbis_tag):
 
 
 def get_tags(path):
-    """ Retrieves the relevant tags for a single file """
+    """Retrieves the relevant tags for a single file"""
     metaflac_args = ["metaflac"]
     for tag in VORBIS_ARG_NAME:
         metaflac_args += ["--show-tag", VORBIS_ARG_NAME[tag]]
@@ -150,7 +151,7 @@ def get_tags(path):
 
 
 def show_tags(path):
-    """ Shows the relevant tags already present in the given flac file """
+    """Shows the relevant tags already present in the given flac file"""
     tags = get_tags(path)
     print("File: {}".format(path))
 
@@ -161,7 +162,7 @@ def show_tags(path):
 
 
 def main():
-    """ Entrypoint function """
+    """Entrypoint function"""
     args = vars(argparser())
 
     has_errors = False