diff --git a/disk_cleanup.sh b/disk_cleanup.sh
index a8d29bc..801c54f 100644
--- a/disk_cleanup.sh
+++ b/disk_cleanup.sh
@@ -15,41 +15,234 @@
 # You should have received a copy of the GNU General Public License along 
 # with this program. If not, see <https://www.gnu.org/licenses/>.
 # 
-# Usage: disk_cleanup.sh [--clean]
-# Description: Without --clean, displays disk usage and largest files. With --clean, performs cleanup of caches and /tmp.
- 
-if [ "$1" != "--clean" ]; then
+# Usage: disk_cleanup.sh [OPTIONS]
+# Options:
+#   --clean              Perform cleanup of package caches and temporary files
+#   --dry-run            Show what would be cleaned without actually removing files
+#   --age DAYS           Set age threshold for temp file cleanup (default: 7)
+#   --dirs DIR1,DIR2     Specify custom directories to clean (default: /tmp,/var/tmp)
+#   --help               Display this help message
+#
+# Examples:
+#   disk_cleanup.sh                              # Show disk usage overview
+#   disk_cleanup.sh --clean                      # Perform cleanup with defaults
+#   disk_cleanup.sh --dry-run                    # Preview cleanup actions
+#   disk_cleanup.sh --clean --age 14 --dry-run   # Preview cleanup with 14-day threshold
+#
+
+set -o pipefail
+
+# ===== CONFIGURATION =====
+AGE_THRESHOLD=7
+DIRS_TO_CLEAN=("/tmp" "/var/tmp")
+DRY_RUN=false
+CLEAN_MODE=false
+LOG_FILE="/var/log/disk_cleanup.log"
+
+# ===== UTILITY FUNCTIONS =====
+
+# Print usage information
+usage() {
+  head -n 22 "$0" | tail -n +18
+}
+
+# Log messages to file and stdout
+log() {
+  local message="$1"
+  echo "[$(date '+%Y-%m-%d %H:%M:%S')] $message" | tee -a "$LOG_FILE" 2>/dev/null || echo "$message"
+}
+
+# Error handler
+error_exit() {
+  local message="$1"
+  local exit_code="${2:-1}"
+  echo "ERROR: $message" >&2
+  exit "$exit_code"
+}
+
+# Check for required commands
+check_dependencies() {
+  local dependencies=("df" "find" "awk" "sort")
+  local missing_deps=()
+  
+  for cmd in "${dependencies[@]}"; do
+    if ! command -v "$cmd" &> /dev/null; then
+      missing_deps+=("$cmd")
+    fi
+  done
+  
+  if [ ${#missing_deps[@]} -gt 0 ]; then
+    error_exit "Missing required commands: ${missing_deps[*]}"
+  fi
+}
+
+# Verify root privileges
+check_root() {
+  if [ $EUID -ne 0 ]; then
+    error_exit "This action requires root privileges. Please run with sudo." 1
+  fi
+}
+
+# ===== DISPLAY FUNCTIONS =====
+
+# Show disk usage overview
+show_disk_usage() {
   echo "==== Disk Usage Overview ===="
-  df -h -x tmpfs -x devtmpfs
+  df -h -x tmpfs -x devtmpfs || error_exit "Failed to get disk usage information"
   
   echo -e "\n==== Top 10 Largest Files ===="
-  # List top 10 largest files (size in MB)
-  find / -type f -printf '%s %p\n' 2>/dev/null | sort -nr | head -n 10 | awk '{size=$1/1024/1024; printf("%.1f MB - ", size); $1=""; print $0;}'
+  find / -type f -printf '%s %p\n' 2>/dev/null | sort -nr | head -n 10 | \
+    awk '{size=$1/1024/1024; printf("%.1f MB - ", size); $1=""; print $0}' || \
+    echo "Warning: Could not retrieve largest files"
+}
+
+# ===== CLEANUP FUNCTIONS =====
+
+# Clean package manager caches
+clean_package_caches() {
+  local cleaned=false
   
-  echo -e "\n(To actually free space, run: $0 --clean)"
-  exit 0
-fi
+  if command -v apt-get &> /dev/null; then
+    log "Cleaning apt package cache..."
+    if [ "$DRY_RUN" = false ]; then
+      apt-get clean || log "Warning: apt-get clean failed"
+    fi
+    cleaned=true
+  fi
+  
+  if command -v dnf &> /dev/null; then
+    log "Cleaning dnf package cache..."
+    if [ "$DRY_RUN" = false ]; then
+      dnf clean all -y &> /dev/null || log "Warning: dnf clean failed"
+    fi
+    cleaned=true
+  fi
+  
+  if command -v yum &> /dev/null; then
+    log "Cleaning yum package cache..."
+    if [ "$DRY_RUN" = false ]; then
+      yum clean all -y &> /dev/null || log "Warning: yum clean failed"
+    fi
+    cleaned=true
+  fi
+  
+  if command -v pacman &> /dev/null; then
+    log "Cleaning pacman package cache..."
+    if [ "$DRY_RUN" = false ]; then
+      pacman -Scc --noconfirm &> /dev/null || log "Warning: pacman clean failed"
+    fi
+    cleaned=true
+  fi
+  
+  if [ "$cleaned" = false ]; then
+    log "Warning: No supported package manager found"
+  fi
+}
 
-# If --clean is specified:
-echo "Cleaning package caches and temporary files..."
-# Package manager cache cleanup
-if [ $EUID -ne 0 ]; then
-  echo "Run as root to perform cleanup."; exit 1
-fi
-if command -v apt-get &> /dev/null; then
-  apt-get clean
-elif command -v dnf &> /dev/null; then
-  dnf clean all
-elif command -v yum &> /dev/null; then
-  yum clean all
-elif command -v pacman &> /dev/null; then
-  pacman -Scc --noconfirm
-fi
+# Clean temporary files
+clean_temporary_files() {
+  local total_freed=0
+  
+  for dir in "${DIRS_TO_CLEAN[@]}"; do
+    if [ ! -d "$dir" ]; then
+      log "Warning: Directory $dir does not exist, skipping..."
+      continue
+    fi
+    
+    log "Cleaning files older than $AGE_THRESHOLD days in $dir..."
+    
+    # Count files that would be deleted
+    local file_count
+    file_count=$(find "$dir" -type f -mtime +"$AGE_THRESHOLD" 2>/dev/null | wc -l)
+    
+    if [ "$file_count" -gt 0 ]; then
+      if [ "$DRY_RUN" = true ]; then
+        log "DRY RUN: Would remove $file_count files from $dir"
+        find "$dir" -type f -mtime +"$AGE_THRESHOLD" 2>/dev/null | head -n 5 | while read -r file; do
+          log "  - $file"
+        done
+        if [ "$file_count" -gt 5 ]; then
+          log "  ... and $((file_count - 5)) more files"
+        fi
+      else
+        if find "$dir" -type f -mtime +"$AGE_THRESHOLD" -delete 2>/dev/null; then
+          log "Removed $file_count old files from $dir"
+        else
+          log "Warning: Failed to remove all files from $dir"
+        fi
+      fi
+    else
+      log "No files older than $AGE_THRESHOLD days found in $dir"
+    fi
+    
+    # Clean empty directories
+    if [ "$DRY_RUN" = false ]; then
+      find "$dir" -type d -empty -mtime +"$AGE_THRESHOLD" -delete 2>/dev/null || true
+    fi
+  done
+}
 
-# Clean /tmp and /var/tmp files older than 7 days
-find /tmp -type f -mtime +7 -exec rm -f {} \;
-find /tmp -type d -empty -mtime +7 -exec rmdir {} \;
-find /var/tmp -type f -mtime +7 -exec rm -f {} \;
-echo "Temporary files older than 7 days removed from /tmp and /var/tmp."
+# ===== PARSE ARGUMENTS =====
 
-echo "Disk cleanup completed."
+parse_arguments() {
+  while [ $# -gt 0 ]; do
+    case "$1" in
+      --clean)
+        CLEAN_MODE=true
+        ;;
+      --dry-run)
+        DRY_RUN=true
+        ;;
+      --age)
+        if [ -z "$2" ] || ! [[ "$2" =~ ^[0-9]+$ ]]; then
+          error_exit "Invalid age value. Must be a number." 1
+        fi
+        AGE_THRESHOLD="$2"
+        shift
+        ;;
+      --dirs)
+        if [ -z "$2" ]; then
+          error_exit "Missing directory list for --dirs option." 1
+        fi
+        IFS=',' read -ra DIRS_TO_CLEAN <<< "$2"
+        shift
+        ;;
+      --help)
+        usage
+        exit 0
+        ;;
+      *)
+        error_exit "Unknown option: $1. Use --help for usage information." 1
+        ;;
+    esac
+    shift
+  done
+}
+
+# ===== MAIN EXECUTION =====
+
+main() {
+  check_dependencies
+  parse_arguments "$@"
+  
+  if [ "$CLEAN_MODE" = false ]; then
+    # Display mode
+    show_disk_usage
+    echo -e "\n(To actually free space, run: sudo $0 --clean)"
+  else
+    # Cleanup mode
+    check_root
+    
+    if [ "$DRY_RUN" = true ]; then
+      log "DRY RUN MODE - No files will be deleted"
+    fi
+    
+    log "Starting disk cleanup process..."
+    clean_package_caches
+    clean_temporary_files
+    
+    log "Disk cleanup process completed."
+  fi
+}
+
+main "$@"
\ No newline at end of file