diff --git a/files/services/S50nginx b/files/services/S50nginx
index 53cf166..f18a791 100755
--- a/files/services/S50nginx
+++ b/files/services/S50nginx
@@ -1,29 +1,26 @@
 #!/bin/sh
 #
-# Start/stop nginx
+# Nginx Service
 #
 
-NGINX=/usr/data/nginx/sbin/nginx
-PIDFILE=/var/run/nginx.pid
+NGINX="/usr/data/nginx/sbin/nginx"
+PIDFILE="/var/run/nginx.pid"
 NGINX_ARGS="-c /usr/data/nginx/nginx/nginx.conf"
 
 case "$1" in
   start)
-	echo "Starting nginx..."
 	mkdir -p /var/log/nginx /var/tmp/nginx
 	start-stop-daemon -S -p "$PIDFILE" --exec "$NGINX" -- $NGINX_ARGS
 	;;
   stop)
-	echo "Stopping nginx..."
 	start-stop-daemon -K -x "$NGINX" -p "$PIDFILE" -o
 	;;
   reload|force-reload)
-	echo "Reloading nginx configuration..."
 	"$NGINX" -s reload
 	;;
   restart)
 	"$0" stop
-	sleep 1 # Prevent race condition: ensure nginx stops before start.
+	sleep 1
 	"$0" start
 	;;
   *)
diff --git a/files/services/S55klipper_service b/files/services/S55klipper_service
index fce9a34..0954088 100755
--- a/files/services/S55klipper_service
+++ b/files/services/S55klipper_service
@@ -1,54 +1,52 @@
 #!/bin/sh
 #
-# Starts klipper service.
+# Klipper Service
 #
 
-USER_DATA=/usr/data
-PROG=/usr/share/klippy-env/bin/python
-PY_SCRIPT=/usr/share/klipper/klippy/klippy.py
-PRINTER_DATA_DIR=$USER_DATA/printer_data
-PRINTER_CONFIG_DIR=$PRINTER_DATA_DIR/config
-PRINTER_LOGS_DIR=$PRINTER_DATA_DIR/logs
-PID_FILE=/var/run/klippy.pid
+USER_DATA="/usr/data"
+PROG="/usr/share/klippy-env/bin/python"
+PY_SCRIPT="/usr/share/klipper/klippy/klippy.py"
+PRINTER_DATA_DIR="$USER_DATA/printer_data"
+PRINTER_CONFIG_DIR="$PRINTER_DATA_DIR/config"
+PRINTER_LOGS_DIR="$PRINTER_DATA_DIR/logs"
+PID_FILE="/var/run/klippy.pid"
 
 mcu_reset()
 {
-    [ -z $(pidof klipper_mcu) ] || /etc/init.d/S57klipper_mcu restart
+  [ -z "$(pidof klipper_mcu)" ] || /etc/init.d/S57klipper_mcu restart
 }
 
 start() {
-
-        mcu_reset
-
-        HOME=/root start-stop-daemon -S -q -b -m -p $PID_FILE \
-                --exec $PROG -- $PY_SCRIPT \
-                $PRINTER_CONFIG_DIR/printer.cfg \
-                -l $PRINTER_LOGS_DIR/klippy.log \
-                -a /tmp/klippy_uds
+  mcu_reset
+  HOME="/root" start-stop-daemon -S -q -b -m -p "$PID_FILE" \
+    --exec "$PROG" -- "$PY_SCRIPT" \
+    "$PRINTER_CONFIG_DIR"/printer.cfg \
+    -l "$PRINTER_LOGS_DIR"/klippy.log \
+    -a "/tmp/klippy_uds"
 }
 
 stop() {
-        start-stop-daemon -K -q -p $PID_FILE
+  start-stop-daemon -K -q -p $PID_FILE
 }
 
 restart() {
-        stop
-        start
+  stop
+  start
 }
 
 case "$1" in
   start)
-        start
-        ;;
+    start
+    ;;
   stop)
-        stop
-        ;;
+    stop
+    ;;
   restart|reload)
-        restart
-        ;;
+    restart
+    ;;
   *)
-        echo "Usage: $0 {start|stop|restart}"
-        exit 1
+    echo "Usage: $0 {start|stop|restart}"
+    exit 1
 esac
 
 exit $?
diff --git a/files/services/S56moonraker_service b/files/services/S56moonraker_service
index e0da407..ee46be1 100755
--- a/files/services/S56moonraker_service
+++ b/files/services/S56moonraker_service
@@ -1,51 +1,47 @@
 #!/bin/sh
 #
-# Starts moonraker service.
+# Moonraker Service
 #
 
 USER_DATA=/usr/data
 PROG=/usr/data/moonraker/moonraker-env/bin/python
 PY_SCRIPT=/usr/data/moonraker/moonraker/moonraker/moonraker.py
-DEFAULT_CFG=/usr/data/moonraker//moonraker/moonraker.conf
 PRINTER_DATA_DIR=$USER_DATA/printer_data
 PRINTER_CONFIG_DIR=$PRINTER_DATA_DIR/config
 PRINTER_LOGS_DIR=$PRINTER_DATA_DIR/logs
 PID_FILE=/var/run/moonraker.pid
 
-
 start() {
-
-        [ -d $PRINTER_DATA_DIR ] || mkdir -p $PRINTER_DATA_DIR
-        [ -d $PRINTER_CONFIG_DIR ] || mkdir -p $PRINTER_CONFIG_DIR
-        [ -d $PRINTER_LOGS_DIR ] || mkdir -p $PRINTER_LOGS_DIR
-        [ -s $PRINTER_CONFIG_DIR/moonraker.conf ] || cp $DEFAULT_CFG $PRINTER_CONFIG_DIR/moonraker.conf
-
-        rm -rf /usr/data/moonraker/tmp; mkdir -p /usr/data/moonraker/tmp
-        TMPDIR=/usr/data/moonraker/tmp HOME=/root start-stop-daemon -S -q -b -m -p $PID_FILE \
-                --exec $PROG -- $PY_SCRIPT -d $PRINTER_DATA_DIR
+  [ -d $PRINTER_DATA_DIR ] || mkdir -p $PRINTER_DATA_DIR
+  [ -d $PRINTER_CONFIG_DIR ] || mkdir -p $PRINTER_CONFIG_DIR
+  [ -d $PRINTER_LOGS_DIR ] || mkdir -p $PRINTER_LOGS_DIR
+  
+  rm -rf /usr/data/moonraker/tmp; mkdir -p /usr/data/moonraker/tmp
+  TMPDIR=/usr/data/moonraker/tmp HOME=/root start-stop-daemon -S -q -b -m -p $PID_FILE \
+    --exec $PROG -- $PY_SCRIPT -d $PRINTER_DATA_DIR
 }
 stop() {
-        start-stop-daemon -K -q -p $PID_FILE
+  start-stop-daemon -K -q -p $PID_FILE
 }
 restart() {
-        stop
-        sleep 1
-        start
+  stop
+  sleep 1
+  start
 }
 
 case "$1" in
   start)
-        start
-        ;;
+    start
+    ;;
   stop)
-        stop
-        ;;
+    stop
+    ;;
   restart|reload)
-        restart
-        ;;
+    restart
+    ;;
   *)
-        echo "Usage: $0 {start|stop|restart}"
-        exit 1
+    echo "Usage: $0 {start|stop|restart}"
+    exit 1
 esac
 
 exit $?