diff --git a/Rsync/rsync.sh b/Rsync/rsync.sh
index 4089bb7..28907b9 100644
--- a/Rsync/rsync.sh
+++ b/Rsync/rsync.sh
@@ -9,11 +9,17 @@ source "$SCRIPT_DIR/../common.sh"
 
 # ----------------------------- Input -----------------------------
 DIRECTORY="$1"
-[[ -z "$DIRECTORY" ]] && { log "Usage: $0 <directory-to-sync> [--dry-run] [VAR=value ...]"; exit 1; }
-
+if [[ -z "$DIRECTORY" ]]; then
+    echo "Usage: $0 <directory-to-sync> [--dry-run] [VAR=value ...]"
+    exit 1
+fi
 shift
 parse_args "$@"
 
+# ----------------------------- Host & IP -----------------------------
+detect_hosts
+resolve_remote_ip
+
 # ----------------------------- Profile -----------------------------
 PROFILE_NAME=$(basename "$DIRECTORY" | tr '[:upper:]' '[:lower:]')
 
@@ -26,37 +32,64 @@ RETRY_COUNT=${PROFILE_RETRY_COUNT[$PROFILE_NAME]:-$RETRY_COUNT}
 SLEEP=${PROFILE_SLEEP[$PROFILE_NAME]:-$SLEEP}
 EXCLUDE_DIRS=(${PROFILE_EXCLUDE_DIRS[$PROFILE_NAME]:-${EXCLUDE_DIRS[@]}})
 
-log "Detected profile: $PROFILE_NAME"
-log "Settings: MAX_RSYNC_PROCS=$MAX_RSYNC_PROCS, BW_LIMIT=$BW_LIMIT, CONTAINERS=${CRITICAL_CONTAINER_NAMES[*]}, EXCLUDES=${EXCLUDE_DIRS[*]}, DRY_RUN=$DRY_RUN"
+[[ "$ENABLE_LOGGING" == true ]] && echo "[LOG] Detected profile: $PROFILE_NAME"
+[[ "$ENABLE_LOGGING" == true ]] && echo "[LOG] Settings: MAX_RSYNC_PROCS=$MAX_RSYNC_PROCS, BW_LIMIT=$BW_LIMIT, CONTAINERS=${CRITICAL_CONTAINER_NAMES[*]}, EXCLUDES=${EXCLUDE_DIRS[*]}, DRY_RUN=$DRY_RUN"
 
-# ----------------------------- Main Sync -----------------------------
+# ----------------------------- Rsync Wait -----------------------------
+wait_for_rsync() {
+    for attempt in $(seq 1 "$RETRY_COUNT"); do
+        RSYNC_COUNT=$(pgrep -fc "rsync.*root@${REMOTE_SERVER}" || true)
+        if [ "$RSYNC_COUNT" -ge "$MAX_RSYNC_PROCS" ]; then
+            [[ "$ENABLE_LOGGING" == true ]] && echo "[LOG] Waiting... ($RSYNC_COUNT active rsync processes)"
+            sleep "$SLEEP"
+        else
+            return 0
+        fi
+    done
+    echo "Too many rsync processes, exiting."
+    exit 1
+}
+
+# ----------------------------- Main -----------------------------
 main() {
-    log "[$LOCAL_SERVER_NAME] Starting sync: $DIRECTORY → $REMOTE_SERVER:$DIRECTORY"
+    [[ "$ENABLE_LOGGING" == true ]] && echo "[LOG] Starting sync: $DIRECTORY → $REMOTE_SERVER:$DIRECTORY"
 
-    [[ $(check_server_online) ]] || { log "Remote $REMOTE_SERVER_NAME unreachable. Exiting."; exit 1; }
+    # Ping check
+    for i in $(seq 1 "$RETRY_COUNT"); do
+        if ping -c 1 "$REMOTE_SERVER" &>/dev/null; then break; fi
+        echo "Remote $REMOTE_SERVER_NAME down, retrying in $SLEEP seconds..."
+        sleep "$SLEEP"
+    done
+    ping -c 1 "$REMOTE_SERVER" &>/dev/null || { echo "Remote $REMOTE_SERVER_NAME unreachable. Exiting."; exit 1; }
 
     wait_for_rsync
     stop_containers
-
-    # Build rsync command
     get_rsync_opts
+
     for ex in "${EXCLUDE_DIRS[@]}"; do RSYNC_OPTS+=(--exclude="$ex"); done
-    [[ "$DRY_RUN" == true ]] && RSYNC_OPTS+=("--dry-run")
+    [ "$DRY_RUN" = true ] && RSYNC_OPTS+=("--dry-run")
 
     for attempt in $(seq 1 "$RETRY_COUNT"); do
-        log "Starting rsync attempt $attempt/$RETRY_COUNT..."
+        echo "Starting rsync attempt $attempt/$RETRY_COUNT..."
         if rsync "${RSYNC_OPTS[@]}" -e "ssh -i \"$SSH_KEY\" -T -o Compression=no -o IPQoS=throughput" \
             "$DIRECTORY" "root@${REMOTE_SERVER}:$DIRECTORY"; then
-            log "Rsync completed successfully."
+            echo "Rsync completed successfully."
             break
         else
-            log "Rsync attempt $attempt failed."
-            [[ "$attempt" -lt "$RETRY_COUNT" ]] && { log "Retrying in $SLEEP seconds..."; sleep "$SLEEP"; } || { log "All rsync attempts failed."; start_containers; exit 1; }
+            echo "Rsync attempt $attempt failed."
+            if [ "$attempt" -lt "$RETRY_COUNT" ]; then
+                echo "Retrying in $SLEEP seconds..."
+                sleep "$SLEEP"
+            else
+                echo "All $RETRY_COUNT rsync attempts failed."
+                start_containers
+                exit 1
+            fi
         fi
     done
 
     start_containers
-    log "[$LOCAL_SERVER_NAME] Sync complete."
+    [[ "$ENABLE_LOGGING" == true ]] && echo "[LOG] Sync complete."
 }
 
 main
\ No newline at end of file
diff --git a/common.sh b/common.sh
index 4580ca1..5fbeee7 100644
--- a/common.sh
+++ b/common.sh
@@ -17,68 +17,86 @@ parse_args() {
             VAR_VALUE="${ARG#*=}"
             if declare -p "$VAR_NAME" &>/dev/null; then
                 printf -v "$VAR_NAME" '%s' "$VAR_VALUE"
-                log "Overriding $VAR_NAME -> $VAR_VALUE"
+                [[ "$ENABLE_LOGGING" == true ]] && echo "[LOG] Overriding $VAR_NAME -> $VAR_VALUE"
             else
-                log "Warning: Unknown variable $VAR_NAME, ignoring."
+                echo "Warning: Unknown variable $VAR_NAME, ignoring."
             fi
         else
             case "$ARG" in
                 --dry-run|-n) DRY_RUN=true ;;
                 --help|-h) echo "Usage: script [--dry-run|-n] [VAR=value ...]"; exit 0 ;;
-                *) log "Warning: Unknown argument $ARG" ;;
+                *) echo "Warning: Unknown argument $ARG" ;;
             esac
         fi
     done
 }
 
-# ----------------------------- Validation -----------------------------
 require_var() {
     local var="$1"
-    [[ -z "${!var:-}" ]] && { log "Error: Required variable $var is not set."; exit 1; }
+    if [[ -z "${!var:-}" ]]; then
+        echo "Error: Required variable $var is not set."
+        exit 1
+    fi
 }
 
 validate_int() {
     local name="$1"
     local value="$2"
-    [[ ! "$value" =~ ^[0-9]+$ ]] && { log "Error: $name must be a non-negative integer."; exit 1; }
+    if ! [[ "${value:-}" =~ ^[0-9]+$ ]]; then
+        echo "Error: $name must be a non-negative integer."
+        exit 1
+    fi
 }
 
 # ----------------------------- Host Detection & SSH -----------------------------
-LOCAL_HOSTNAME="$(hostname)"
-if [[ "$LOCAL_HOSTNAME" == "$HOST1" ]]; then
-    LOCAL_SERVER_NAME="$HOST1"
-    REMOTE_SERVER_NAME="$HOST2"
-elif [[ "$LOCAL_HOSTNAME" == "$HOST2" ]]; then
-    LOCAL_SERVER_NAME="$HOST2"
-    REMOTE_SERVER_NAME="$HOST1"
-else
-    log "Error: Local hostname ($LOCAL_HOSTNAME) not recognized."
-    exit 1
-fi
+detect_hosts() {
+    LOCAL_HOSTNAME="$(hostname)"
+    if [[ "$LOCAL_HOSTNAME" == "$HOST1" ]]; then
+        LOCAL_SERVER_NAME="$HOST1"
+        REMOTE_SERVER_NAME="$HOST2"
+    elif [[ "$LOCAL_HOSTNAME" == "$HOST2" ]]; then
+        LOCAL_SERVER_NAME="$HOST2"
+        REMOTE_SERVER_NAME="$HOST1"
+    else
+        echo "Error: Local hostname ($LOCAL_HOSTNAME) not recognized."
+        exit 1
+    fi
 
-declare -A SSH_KEYS
-SSH_KEYS["$HOST1|$HOST2"]="$HOST1_SSH_KEY"
-SSH_KEYS["$HOST2|$HOST1"]="$HOST2_SSH_KEY"
+    declare -A SSH_KEYS
+    SSH_KEYS["$HOST1|$HOST2"]="$HOST1_SSH_KEY"
+    SSH_KEYS["$HOST2|$HOST1"]="$HOST2_SSH_KEY"
 
-KEY_ID="$LOCAL_SERVER_NAME|$REMOTE_SERVER_NAME"
-SSH_KEY="${SSH_KEYS[$KEY_ID]}"
-[[ -z "$SSH_KEY" ]] && { log "Error: No SSH key defined for $LOCAL_SERVER_NAME → $REMOTE_SERVER_NAME"; exit 1; }
+    KEY_ID="$LOCAL_SERVER_NAME|$REMOTE_SERVER_NAME"
+    SSH_KEY="${SSH_KEYS[$KEY_ID]}"
+    if [[ -z "$SSH_KEY" ]]; then
+        echo "Error: No SSH key defined for $LOCAL_SERVER_NAME → $REMOTE_SERVER_NAME"
+        exit 1
+    fi
+
+    [[ "$ENABLE_LOGGING" == true ]] && echo "[LOG] Local server: $LOCAL_SERVER_NAME, Remote server: $REMOTE_SERVER_NAME, SSH key: $SSH_KEY"
+}
 
 # ----------------------------- Remote Server IP -----------------------------
-REMOTE_SERVER=$(tailscale ip -4 "$REMOTE_SERVER_NAME" 2>/dev/null)
-[[ -z "$REMOTE_SERVER" ]] && { log "Error: Could not resolve Tailscale IP for $REMOTE_SERVER_NAME"; exit 1; }
-log "Local server: $LOCAL_SERVER_NAME, Remote server: $REMOTE_SERVER_NAME, IP: $REMOTE_SERVER"
+resolve_remote_ip() {
+    REMOTE_SERVER=$(tailscale ip -4 "$REMOTE_SERVER_NAME" 2>/dev/null)
+    if [[ -z "$REMOTE_SERVER" ]]; then
+        echo "Error: Could not resolve Tailscale IP for $REMOTE_SERVER_NAME"
+        exit 1
+    fi
+    [[ "$ENABLE_LOGGING" == true ]] && echo "[LOG] Remote IP: $REMOTE_SERVER"
+}
 
 # ----------------------------- Container Helpers -----------------------------
 declare -a RUNNING_CONTAINERS=()
 
 stop_containers() {
-    log "[$LOCAL_SERVER_NAME] Checking containers on $REMOTE_SERVER_NAME..."
+    [[ "$ENABLE_LOGGING" == true ]] && echo "[LOG] Checking containers on $REMOTE_SERVER_NAME..."
     RUNNING_CONTAINERS=()
     for container in "${CRITICAL_CONTAINER_NAMES[@]}"; do
-        STATUS=$(ssh -i "$SSH_KEY" root@"$REMOTE_SERVER" "docker inspect -f '{{.State.Running}}' $container 2>/dev/null" || echo "false")
+        STATUS=$(ssh -i "$SSH_KEY" root@"$REMOTE_SERVER" \
+            "docker inspect -f '{{.State.Running}}' $container 2>/dev/null" || echo "false")
         if [[ "$STATUS" == "true" ]]; then
-            log "Stopping $container"
+            [[ "$ENABLE_LOGGING" == true ]] && echo "[LOG] Stopping $container"
             RUNNING_CONTAINERS+=("$container")
             ssh -i "$SSH_KEY" root@"$REMOTE_SERVER" "docker stop $container"
         fi
@@ -86,10 +104,10 @@ stop_containers() {
 }
 
 start_containers() {
-    log "[$LOCAL_SERVER_NAME] Restarting containers on $REMOTE_SERVER_NAME..."
+    [[ "$ENABLE_LOGGING" == true ]] && echo "[LOG] Restarting containers on $REMOTE_SERVER_NAME..."
     for container in "${RUNNING_CONTAINERS[@]}"; do
         if [[ " ${DELAYED_CONTAINERS[*]} " == *" $container "* ]]; then
-            log "Delaying start of $container by ${CONTAINER_DELAY}s..."
+            [[ "$ENABLE_LOGGING" == true ]] && echo "[LOG] Delaying start of $container by ${CONTAINER_DELAY}s..."
             sleep "$CONTAINER_DELAY"
         fi
         ssh -i "$SSH_KEY" root@"$REMOTE_SERVER" "docker start $container"
@@ -103,28 +121,4 @@ get_rsync_opts() {
     else
         RSYNC_OPTS=("${DEFAULT_RSYNC_OPTS[@]}")
     fi
-}
-
-# ----------------------------- Wait for Rsync -----------------------------
-wait_for_rsync() {
-    for attempt in $(seq 1 "$RETRY_COUNT"); do
-        RSYNC_COUNT=$(pgrep -fc "rsync.*root@${REMOTE_SERVER}" || true)
-        if [ "$RSYNC_COUNT" -ge "$MAX_RSYNC_PROCS" ]; then
-            log "[$LOCAL_SERVER_NAME] Waiting... ($RSYNC_COUNT active rsync processes)"
-            sleep "$SLEEP"
-        else
-            return 0
-        fi
-    done
-    log "Too many rsync processes, exiting."
-    exit 1
-}
-
-# ----------------------------- Check Server -----------------------------
-check_server_online() {
-    if ping -c 1 "$REMOTE_SERVER" &>/dev/null; then
-        return 0
-    else
-        return 1
-    fi
 }
\ No newline at end of file