diff --git a/neofetch b/neofetch
index 7a7b7f79..dcb2731c 100755
--- a/neofetch
+++ b/neofetch
@@ -1554,10 +1554,9 @@ getbattery () {
                     *) index="$battery_num" ;;
                 esac
 
-                # Create an array of battery usage from each battery.
                 batteries=($(cat /sys/class/power_supply/BAT${battery_num}/capacity))
-                # Get the power status
                 battery_status=($(cat /sys/class/power_supply/BAT${battery_num}/status))
+
                 # Get the subtitle and reassign it so it doesn't change.
                 title="$subtitle"
 
@@ -1584,12 +1583,7 @@ getbattery () {
                         done
                         return
                     fi
-
-		    if [ "$battery_status" == "Charging" ]; then
-			battery="${batteries[0]}% Charging"
-		    else
-			battery="${batteries[0]}%"
-		    fi
+                    battery="${batteries[0]}%"
                 fi
             else
                 battery="None"
@@ -1599,13 +1593,8 @@ getbattery () {
         "BSD")
             case "$distro" in
                 "FreeBSD"*)
-            	    battery_status=$(acpiconf -i 0 | awk -F ':\t\t\t' '/State/ {print $2}')
-
-            	    if [ "$battery_status" == "charging" ]; then
-		        battery="$(acpiconf -i 0 | awk -F ':\t' '/Remaining capacity/ {print $2}') Charging"
-		    else
-		        battery=$(acpiconf -i 0 | awk -F ':\t' '/Remaining capacity/ {print $2}')
-                    fi
+                    battery=$(acpiconf -i 0 | awk -F ':\t' '/Remaining capacity/ {print $2}')
+                    battery_status=$(acpiconf -i 0 | awk -F ':\t\t\t' '/State/ {print $2}')
                 ;;
 
                 "NetBSD"*)
@@ -1628,8 +1617,6 @@ getbattery () {
         "Mac OS X")
             battery="$(pmset -g batt | grep -o '[0-9]*%')"
             battery_status="$(pmset -g batt | awk 'NR==2 {print $3}')"
-            [ "$battery_status" == "charging;" ] && \
-                battery="${battery} Charging"
         ;;
 
         "Windows")
@@ -1641,6 +1628,10 @@ getbattery () {
         ;;
     esac
 
+    case "$battery_status" in
+        *"charging"*) battery+=" Charging" ;;
+    esac
+
     case "$battery_display" in
         "bar") battery="$(bar ${battery/'%'} 100)" ;;
         "infobar") battery="${battery} $(bar "${battery/'%'}" 100)" ;;