diff --git a/lib/functions/cli/commands.sh b/lib/functions/cli/commands.sh
index 811ab23c5..cf53c17ba 100644
--- a/lib/functions/cli/commands.sh
+++ b/lib/functions/cli/commands.sh
@@ -20,8 +20,8 @@ function armbian_register_commands() {
 		["requirements"]="requirements" # implemented in cli_requirements_pre_run and cli_requirements_run
 
 		# Given a board/config/exts, dump out the (non-userspace) JSON of configuration
-		["configdump"]="config_dump_json"              # implemented in cli_config_dump_json_pre_run and cli_config_dump_json_run
-		["config-dump-json"]="config_dump_json"        # implemented in cli_config_dump_json_pre_run and cli_config_dump_json_run
+		["configdump"]="config_dump_json"       # implemented in cli_config_dump_json_pre_run and cli_config_dump_json_run
+		["config-dump-json"]="config_dump_json" # implemented in cli_config_dump_json_pre_run and cli_config_dump_json_run
 
 		["json-info-boards"]="json_info"               # implemented in cli_json_info_pre_run and cli_json_info_run
 		["write-all-boards-branches-json"]="json_info" # implemented in cli_json_info_pre_run and cli_json_info_run
diff --git a/lib/functions/cli/entrypoint.sh b/lib/functions/cli/entrypoint.sh
index 0a0110ecb..efb48c6b9 100644
--- a/lib/functions/cli/entrypoint.sh
+++ b/lib/functions/cli/entrypoint.sh
@@ -170,7 +170,7 @@ function cli_entrypoint() {
 	done
 
 	# Early check for deprecations
-	error_if_lib_tag_set     # make sure users are not thrown off by using old parameter which does nothing anymore; explain
+	error_if_lib_tag_set # make sure users are not thrown off by using old parameter which does nothing anymore; explain
 
 	display_alert "Executing final CLI command" "${ARMBIAN_COMMAND}" "debug"
 	armbian_cli_run_command
diff --git a/lib/functions/compilation/kernel.sh b/lib/functions/compilation/kernel.sh
index 02b644a0c..388d31846 100644
--- a/lib/functions/compilation/kernel.sh
+++ b/lib/functions/compilation/kernel.sh
@@ -96,7 +96,7 @@ function kernel_prepare_build_and_package() {
 	declare -A kernel_install_dirs
 
 	build_targets=("all") # "All" builds the vmlinux/Image/Image.gz default for the ${ARCH}
-	build_targets+=( "${KERNEL_IMAGE_TYPE}" )
+	build_targets+=("${KERNEL_IMAGE_TYPE}")
 	declare cleanup_id="" kernel_dest_install_dir=""
 	prepare_temp_dir_in_workdir_and_schedule_cleanup "k" cleanup_id kernel_dest_install_dir # namerefs
 
@@ -107,12 +107,12 @@ function kernel_prepare_build_and_package() {
 		#["INSTALL_HDR_PATH"]="${kernel_dest_install_dir}/libc_headers" # Used by `make headers_install` - disabled, only used for libc headers
 	)
 
-	[ -z "${SRC_LOADADDR}" ] || install_make_params_quoted+=( "${SRC_LOADADDR}" ) # For uImage
+	[ -z "${SRC_LOADADDR}" ] || install_make_params_quoted+=("${SRC_LOADADDR}") # For uImage
 	# @TODO: Only combining `install` and `modules_install` enable mixed-build and __build_one_by_one
 	# We should spilt the `build` and `install` into two make steps as the kernel required
-	build_targets+=( "install" "${KERNEL_INSTALL_TYPE:-install}" )
+	build_targets+=("install" "${KERNEL_INSTALL_TYPE:-install}")
 
-	build_targets+=( "modules_install" ) # headers_install disabled, only used for libc headers
+	build_targets+=("modules_install") # headers_install disabled, only used for libc headers
 	if [[ "${KERNEL_BUILD_DTBS:-yes}" == "yes" ]]; then
 		display_alert "Kernel build will produce DTBs!" "DTBs YES" "debug"
 		build_targets+=("dtbs_install")
diff --git a/lib/functions/compilation/patch/drivers_network.sh b/lib/functions/compilation/patch/drivers_network.sh
index 5461076db..f74900abb 100644
--- a/lib/functions/compilation/patch/drivers_network.sh
+++ b/lib/functions/compilation/patch/drivers_network.sh
@@ -570,10 +570,8 @@ driver_uwe5622_allwinner() {
 	fi
 }
 
-driver_rtl8723cs()
-{
-
-	# Realtek rtl8723cs wireless support. 
+driver_rtl8723cs() {
+	# Realtek rtl8723cs wireless support.
 	# Driver has been borrowed from sunxi 6.1 megous patch archive.
 	# Applies only from linux 6.1 onwards, so older kernel archives does not require to be altered
 	if linux-version compare "${version}" ge 6.1; then
@@ -614,8 +612,6 @@ driver_rtl8723cs()
 		process_patch_file "${SRC}/patch/misc/wireless-rtl8723cs/bluetooth-btrtl-add-rtl8703bs.patch" "applying"
 
 	fi
-
-
 }
 
 patch_drivers_network() {
diff --git a/lib/functions/main/config-prepare.sh b/lib/functions/main/config-prepare.sh
index f33658c07..45ada3fee 100644
--- a/lib/functions/main/config-prepare.sh
+++ b/lib/functions/main/config-prepare.sh
@@ -199,8 +199,6 @@ function config_post_main() {
 		ATFSOURCEDIR="${ATFDIR}/$(branch2dir "${ATFBRANCH}")"
 	fi
 
-#	declare -g BSP_CLI_PACKAGE_NAME="armbian-bsp-cli-${BOARD}${EXTRA_BSP_NAME}"
-#	declare -g BSP_CLI_PACKAGE_FULLNAME="${BSP_CLI_PACKAGE_NAME}_${REVISION}_${ARCH}"
 	declare -g BSP_DESKTOP_PACKAGE_NAME="armbian-bsp-desktop-${BOARD}${EXTRA_BSP_NAME}"
 	declare -g BSP_DESKTOP_PACKAGE_FULLNAME="${BSP_DESKTOP_PACKAGE_NAME}_${REVISION}_${ARCH}"
 
diff --git a/lib/functions/rootfs/distro-specific.sh b/lib/functions/rootfs/distro-specific.sh
index a3806ed37..b43e55436 100644
--- a/lib/functions/rootfs/distro-specific.sh
+++ b/lib/functions/rootfs/distro-specific.sh
@@ -55,7 +55,7 @@ function install_distribution_specific() {
 			install_deb_chroot "${DEB_STORAGE}/${image_artifacts_debs["fake-ubuntu-advantage-tools"]}"
 			truncate --size=0 "${SDCARD}"/etc/apt/apt.conf.d/20apt-esm-hook.conf
 
-	;;
+			;;
 	esac
 
 	# Basic Netplan config. Let NetworkManager/networkd manage all devices on this system