diff --git a/lib/util-iso.sh b/lib/util-iso.sh
index 2cc0c1e..a9a3376 100644
--- a/lib/util-iso.sh
+++ b/lib/util-iso.sh
@@ -222,24 +222,15 @@ gen_iso_fn(){
     fi
     vars+=("${dist_release}")
     
-    # add branch if not stable
-    if [[ ! ${target_branch} == "stable" ]]; then
-        vars+=("${target_branch}")
-    fi
+    [[ ! ${target_branch} == "stable" ]] && vars+=("${target_branch}")
 
     [[ ${extra} == 'false' ]] && vars+=("minimal")
-    
-    # build date
+
     vars+=("$(date +%y%m%d)")
-    
-    # kernel version
+
     vars+=("${kernel}")
-    
-    # add architecture if 32-bit
-    if [[ ${target_arch} == "i686" ]]; then
-        vars+=("${target_arch}")
-    fi
-    
+
+    [[ ${target_arch} == "i686" ]] && vars+=("${target_arch}")    
     for n in ${vars[@]}; do
         name=${name:-}${name:+-}${n}
     done