diff --git a/setup.csh b/setup.csh
index 8bbc4063544bafc591e3e7ca94f5b2d0b065eaf1..d7df18c89cf06ac4bea58b32ff02b2cd2fbf27d2 100644
--- a/setup.csh
+++ b/setup.csh
@@ -2,29 +2,17 @@
 
 set called=($_)
 if ("$called" != "") then
-set scriptdir=$called[2]
-  echo $scriptdir
-# set MYDIR=`dirname $scriptdir`
-# set MYDIR=`cd $MYDIR && pwd` # ensure absolute path
-
-  set MYDIR=`pwd` # ensure absolute path
-
-# echo $MYDIR
-# echo "Are we here"
+  set scriptdir=$called[2]
+  set MYDIR=`dirname $scriptdir`
+  set MYDIR=`cd $MYDIR && pwd`    # ensure absolute path
 else
-set scriptdir=$1
+  set scriptdir=$1
   set MYDIR=$scriptdir
 endif
-
-
 setenv ANALYZER $MYDIR/podd
 setenv HCANALYZER $MYDIR
-
 # Check if LD_LIBRARY_PATH is defined
 if ( ! ($?LD_LIBRARY_PATH) ) then
-setenv LD_LIBRARY_PATH ""
+   setenv LD_LIBRARY_PATH ""
 endif
 setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${ANALYZER}:${HCANALYZER}"
-
-echo $ANALYZER
-echo $HCANALYZER