diff --git a/.editorconfig b/.editorconfig
index 0f5876c489..e35a1b04e5 100755
--- a/.editorconfig
+++ b/.editorconfig
@@ -23,7 +23,7 @@ shell_variant      = bash
 binary_next_line   = true  # like -bn
 switch_case_indent = true  # like -ci
 space_redirects    = true  # like -sr
-keep_padding       = true  # like -kp
+keep_padding       = false  # like -kp
 end_of_line        = lf
 charset            = utf-8
 trim_trailing_whitespace = true
diff --git a/aliases/available/dnf.aliases.bash b/aliases/available/dnf.aliases.bash
index 974cb19b2c..9d9f02673a 100644
--- a/aliases/available/dnf.aliases.bash
+++ b/aliases/available/dnf.aliases.bash
@@ -2,17 +2,17 @@
 cite 'about-alias'
 about-alias 'dnf aliases for fedora 22+ distros'
 
-alias dnfl="dnf list"                       # List packages
-alias dnfli="dnf list installed"            # List installed packages
-alias dnfgl="dnf grouplist"                 # List package groups
-alias dnfmc="dnf makecache"                 # Generate metadata cache
-alias dnfp="dnf info"                       # Show package information
-alias dnfs="dnf search"                     # Search package
+alias dnfl="dnf list"            # List packages
+alias dnfli="dnf list installed" # List installed packages
+alias dnfgl="dnf grouplist"      # List package groups
+alias dnfmc="dnf makecache"      # Generate metadata cache
+alias dnfp="dnf info"            # Show package information
+alias dnfs="dnf search"          # Search package
 
-alias dnfu="sudo dnf upgrade"               # Upgrade package
-alias dnfi="sudo dnf install"               # Install package
-alias dnfri='sudo dnf reinstall'            # Reinstall package
-alias dnfgi="sudo dnf groupinstall"         # Install package group
-alias dnfr="sudo dnf remove"                # Remove package
-alias dnfgr="sudo dnf groupremove"          # Remove package group
-alias dnfc="sudo dnf clean all"             # Clean cache
+alias dnfu="sudo dnf upgrade"       # Upgrade package
+alias dnfi="sudo dnf install"       # Install package
+alias dnfri='sudo dnf reinstall'    # Reinstall package
+alias dnfgi="sudo dnf groupinstall" # Install package group
+alias dnfr="sudo dnf remove"        # Remove package
+alias dnfgr="sudo dnf groupremove"  # Remove package group
+alias dnfc="sudo dnf clean all"     # Clean cache
diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash
index 39d10c6778..bcb3887d86 100644
--- a/aliases/available/git.aliases.bash
+++ b/aliases/available/git.aliases.bash
@@ -155,7 +155,7 @@ alias gst='git stash'
 alias gstb='git stash branch'
 alias gstd='git stash drop'
 alias gstl='git stash list'
-alias gstp='git stash pop' # kept due to long-standing usage
+alias gstp='git stash pop'  # kept due to long-standing usage
 alias gstpo='git stash pop' # recommended for it's symmetry with gstpu (push)
 
 ## 'stash push' introduced in git v2.13.2
diff --git a/themes/base.theme.bash b/themes/base.theme.bash
index 2e945ac672..3030595738 100644
--- a/themes/base.theme.bash
+++ b/themes/base.theme.bash
@@ -87,8 +87,8 @@ RBFU_THEME_PROMPT_SUFFIX='|'
 
 GIT_EXE=$(which git 2> /dev/null || true)
 P4_EXE=$(which p4 2> /dev/null || true)
-HG_EXE=$(which hg  2> /dev/null || true)
-SVN_EXE=$(which svn  2> /dev/null || true)
+HG_EXE=$(which hg 2> /dev/null || true)
+SVN_EXE=$(which svn 2> /dev/null || true)
 
 # Check for broken SVN exe that is caused by some versions of Xcode.
 # See https://github.com/Bash-it/bash-it/issues/1612 for more details.
@@ -207,8 +207,10 @@ function git_prompt_minimal_info {
 }
 
 function git_prompt_vars {
-	if ${SCM_GIT_USE_GITSTATUS} && _command_exists gitstatus_query && gitstatus_query && [[ "${VCS_STATUS_RESULT}" == "ok-sync" ]]; then # use faster gitstatus
-		SCM_GIT_GITSTATUS_RAN=true # use this in githelpers and below to choose gitstatus output
+	if ${SCM_GIT_USE_GITSTATUS} && _command_exists gitstatus_query && gitstatus_query && [[ "${VCS_STATUS_RESULT}" == "ok-sync" ]]; then
+		# we can use faster gitstatus
+		# use this variable in githelpers and below to choose gitstatus output
+		SCM_GIT_GITSTATUS_RAN=true
 	else
 		SCM_GIT_GITSTATUS_RAN=false
 	fi