diff --git a/packages/addons/addon-depends/docker/cli/package.mk b/packages/addons/addon-depends/docker/cli/package.mk
index 2da831e362..21779848e2 100644
--- a/packages/addons/addon-depends/docker/cli/package.mk
+++ b/packages/addons/addon-depends/docker/cli/package.mk
@@ -24,7 +24,7 @@ configure_target() {
   export VERSION=${PKG_VERSION}
   export BUILDTIME="$(date --utc)"
 
-  cat > "${PKG_BUILD}/go.mod" << EOF
+  cat >"${PKG_BUILD}/go.mod" <<EOF
 module github.com/docker/cli
 
 go 1.18
diff --git a/packages/addons/addon-depends/docker/moby/package.mk b/packages/addons/addon-depends/docker/moby/package.mk
index 293ffbe765..c663af170a 100644
--- a/packages/addons/addon-depends/docker/moby/package.mk
+++ b/packages/addons/addon-depends/docker/moby/package.mk
@@ -31,7 +31,7 @@ configure_target() {
   export VERSION=${PKG_VERSION}
   export BUILDTIME="$(date --utc)"
 
-  cat > "${PKG_BUILD}/go.mod" << EOF
+  cat >"${PKG_BUILD}/go.mod" <<EOF
 module github.com/docker/docker
 
 go 1.18
diff --git a/packages/addons/addon-depends/docker/tini/package.mk b/packages/addons/addon-depends/docker/tini/package.mk
index ec5520e4dd..819bf220a2 100644
--- a/packages/addons/addon-depends/docker/tini/package.mk
+++ b/packages/addons/addon-depends/docker/tini/package.mk
@@ -13,7 +13,7 @@ PKG_LONGDESC="Tini is a simplest init system."
 
 PKG_MAKE_OPTS_TARGET="tini-static"
 
-pre_configure_target(){
+pre_configure_target() {
   sed -i "s|@tini_VERSION_GIT@| - git.${PKG_VERSION}|" ${PKG_BUILD}/src/tiniConfig.h.in
 }
 
diff --git a/packages/addons/addon-depends/ffmpegx/package.mk b/packages/addons/addon-depends/ffmpegx/package.mk
index a162bbf095..0fabe6e354 100644
--- a/packages/addons/addon-depends/ffmpegx/package.mk
+++ b/packages/addons/addon-depends/ffmpegx/package.mk
@@ -35,7 +35,7 @@ pre_configure_target() {
   cd ${PKG_BUILD}
   rm -rf .${TARGET_NAME}
 
-# HW encoders
+  # HW encoders
 
   # Generic
   if [[ "${TARGET_ARCH}" = "x86_64" ]]; then
@@ -69,7 +69,7 @@ pre_configure_target() {
     --enable-encoder=libx265"
   fi
 
-# Encoders
+  # Encoders
     PKG_FFMPEG_ENCODERS="\
     `#Video encoders` \
     --enable-libvpx \
@@ -91,7 +91,7 @@ pre_configure_target() {
     --enable-libvorbis \
     --enable-encoder=libvorbis"
 
-# X11 grab for screen recording
+  # X11 grab for screen recording
   if [ "${DISPLAYSERVER}" = "x11" ]; then
     PKG_FFMPEG_LIBS+=" -lX11"
     PKG_FFMPEG_X11_GRAB="\
@@ -165,6 +165,6 @@ configure_target() {
     --enable-libxml2 \
     \
     `#Advanced options` \
-    --disable-hardcoded-tables \
+    --disable-hardcoded-tables
 
 }
diff --git a/packages/addons/addon-depends/libid3tag/package.mk b/packages/addons/addon-depends/libid3tag/package.mk
index aa1a8bf9b9..3567aea3a7 100644
--- a/packages/addons/addon-depends/libid3tag/package.mk
+++ b/packages/addons/addon-depends/libid3tag/package.mk
@@ -14,6 +14,6 @@ PKG_LONGDESC="A library for id3 tagging."
 PKG_CONFIGURE_OPTS_TARGET="--enable-static \
                            --disable-shared"
 
-post_makeinstall_target(){
- cp ${PKG_BUILD}/id3tag.pc ${SYSROOT_PREFIX}/usr/lib/pkgconfig
+post_makeinstall_target() {
+  cp ${PKG_BUILD}/id3tag.pc ${SYSROOT_PREFIX}/usr/lib/pkgconfig
 }
diff --git a/packages/addons/addon-depends/libmad/package.mk b/packages/addons/addon-depends/libmad/package.mk
index 7d8c8d6456..3da933c5e4 100644
--- a/packages/addons/addon-depends/libmad/package.mk
+++ b/packages/addons/addon-depends/libmad/package.mk
@@ -19,7 +19,7 @@ fi
 
 post_makeinstall_target() {
   mkdir -p ${SYSROOT_PREFIX}/usr/lib/pkgconfig
-  cat > ${SYSROOT_PREFIX}/usr/lib/pkgconfig/mad.pc << "EOF"
+  cat >${SYSROOT_PREFIX}/usr/lib/pkgconfig/mad.pc  <<"EOF"
 prefix=/usr
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
diff --git a/packages/addons/addon-depends/network-tools-depends/depends/libpcap/package.mk b/packages/addons/addon-depends/network-tools-depends/depends/libpcap/package.mk
index 858e39b4f1..4f0860ea3c 100644
--- a/packages/addons/addon-depends/network-tools-depends/depends/libpcap/package.mk
+++ b/packages/addons/addon-depends/network-tools-depends/depends/libpcap/package.mk
@@ -23,8 +23,8 @@ PKG_CONFIGURE_OPTS_TARGET="LIBS=-lpthread \
                            --disable-canusb"
 
 pre_configure_target() {
-# When cross-compiling, configure can't set linux version
-# forcing it
+  # When cross-compiling, configure can't set linux version
+  # forcing it
   sed -i -e 's/ac_cv_linux_vers=unknown/ac_cv_linux_vers=2/' ../configure
 }
 
diff --git a/packages/addons/addon-depends/network-tools-depends/nmap/package.mk b/packages/addons/addon-depends/network-tools-depends/nmap/package.mk
index 32a2bd5b59..25aa5205a0 100644
--- a/packages/addons/addon-depends/network-tools-depends/nmap/package.mk
+++ b/packages/addons/addon-depends/network-tools-depends/nmap/package.mk
@@ -23,7 +23,7 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \
                            --with-zenmap=no"
 
 pre_configure_target() {
-# nmap fails to build in subdirs
+  # nmap fails to build in subdirs
   cd ${PKG_BUILD}
     rm -rf .${TARGET_NAME}
 
diff --git a/packages/addons/addon-depends/rpi-tools-depends/lg-gpio/package.mk b/packages/addons/addon-depends/rpi-tools-depends/lg-gpio/package.mk
index e243f8c3c7..5fe900c315 100644
--- a/packages/addons/addon-depends/rpi-tools-depends/lg-gpio/package.mk
+++ b/packages/addons/addon-depends/rpi-tools-depends/lg-gpio/package.mk
@@ -26,4 +26,3 @@ make_target() {
     python setup.py build
   )
 }
-
diff --git a/packages/addons/addon-depends/system-tools-depends/dool/package.mk b/packages/addons/addon-depends/system-tools-depends/dool/package.mk
index b9d673377d..bbec8a6873 100644
--- a/packages/addons/addon-depends/system-tools-depends/dool/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/dool/package.mk
@@ -20,6 +20,6 @@ makeinstall_target() {
   mkdir -p ${INSTALL}/usr/bin
   cp -p dool ${INSTALL}/usr/bin
   cp -pr plugins ${INSTALL}/usr/bin
-  printf "#!/bin/sh\n\necho \"\${0} has been replaced by dool\"" > ${INSTALL}/usr/bin/dstat
+  printf "#!/bin/sh\n\necho \"\${0} has been replaced by dool\"" >${INSTALL}/usr/bin/dstat
   chmod 755 ${INSTALL}/usr/bin/dstat
 }
diff --git a/packages/addons/addon-depends/system-tools-depends/screen/package.mk b/packages/addons/addon-depends/system-tools-depends/screen/package.mk
index 5e8fea476b..79d9ea68dc 100644
--- a/packages/addons/addon-depends/system-tools-depends/screen/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/screen/package.mk
@@ -18,4 +18,3 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_utempter_h=no \
                            --disable-use-locale \
                            --disable-telnet \
                            --disable-socket-dir"
-
diff --git a/packages/addons/addon-depends/system-tools-depends/vim/package.mk b/packages/addons/addon-depends/system-tools-depends/vim/package.mk
index d6606c9efd..0f1066eb1e 100644
--- a/packages/addons/addon-depends/system-tools-depends/vim/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/vim/package.mk
@@ -48,8 +48,8 @@ pre_makeinstall_target() {
 
 post_makeinstall_target() {
   (
-  cd ${INSTALL}/storage/.kodi/addons/virtual.system-tools/data/vim
-  rm -r doc tutor gvimrc_example.vim
-  mv vimrc_example.vim vimrc
+    cd ${INSTALL}/storage/.kodi/addons/virtual.system-tools/data/vim
+    rm -r doc tutor gvimrc_example.vim
+    mv vimrc_example.vim vimrc
   )
 }
diff --git a/packages/addons/addon-depends/vdr/package.mk b/packages/addons/addon-depends/vdr/package.mk
index 02f4ab3ee4..27f25654dd 100644
--- a/packages/addons/addon-depends/vdr/package.mk
+++ b/packages/addons/addon-depends/vdr/package.mk
@@ -23,7 +23,7 @@ pre_configure_target() {
 }
 
 pre_make_target() {
-  cat > Make.config <<EOF
+  cat >Make.config <<EOF
   PLUGINLIBDIR = /usr/lib/vdr
   PREFIX = /usr
   VIDEODIR = /storage/videos