diff --git a/make/projects-dir.mk b/make/projects-dir.mk
index 92242d70..df1eee96 100644
--- a/make/projects-dir.mk
+++ b/make/projects-dir.mk
@@ -1,3 +1,5 @@
+# ------------ initial CVS subdir
+
 define CVSDIR_MIME =
 QlpoOTFBWSZTWSqR0W8AALh/ks+QASBAAf/yb9JbRH9/32AMACAICEhAAjxQBTCUkmTEZGh6
 gAAAAA0AGgHMAmAmRgBGJiYTCYIaYmmBzAJgJkYARiYmEwmCGmJpgFURNE2k1NGlPT1NJmoH
@@ -16,14 +18,12 @@ define newline
 
 endef
 
+# ------------ makefile and environment variables
+
 ifneq ($(PROJECTS),)
   export PGIT_CLONE_PROJECTS = $(PROJECTS)
 endif
 
-ifneq ($(CLONE_FROM_USER),)
-  export PGIT_CLONE_FROM_USER = $(CLONE_FROM_USER)
-endif
-
 ifneq ($(wildcard projects.txt),)
   PROJECTS = $(shell cat projects.txt | sed '/^ *\#/ d')
   # TODO: this could be nicer
@@ -33,27 +33,6 @@ else
   CVS_PROJECTS = $(filter $(dir $(wildcard */CVS)),$(PROJECTS))
 endif
 
-ifeq ($(JANWARE_USER),)
-  WHOAMI = $(shell id -un)
-else
-  WHOAMI = $(JANWARE_USER)
-endif
-
-ifeq ($(CVSROOT),)
-  CVSROOT = :ext:$(WHOAMI)@cvs.jannet.de:/home/jannet/arc/cvs
-  export CVSROOT
-endif
-
-ifeq ($(CVS_RSH),)
-  CVS_RSH = ssh
-  export CVS_RSH
-endif
-
-PGIT       = CLONE_PROJECTS="$(PROJECTS)" PGIT_CLONE_FROM_USER="$(JANWARE_USER)" /bin/bash $(firstword $(wildcard ./ytools/devutil/scripts/pgit.sh /opt/ytools/bin/pgit.sh) pgit.sh-not-found)
-BUILD_PY   = python ./ytools/devutil/scripts/build.py -b $(shell pwd) $(BUILD_PY_EXTRA_ARGS)
-PURGE_SH   = /bin/bash $(firstword $(wildcard ./ytools/devutil/scripts/purge-stale-projects.sh /opt/ytools/bin/purge-stale-projects.sh) purge-not-found)
-RELEASE_SH = /bin/bash $(firstword $(wildcard ./ytools/devutil/scripts/build-release.sh /opt/ytools/bin/build-release.sh) release-not-found)
-
 EXCLUDE_FROM_BUILD = \
 	dspider-btools \
 	dspider-shared \
@@ -63,6 +42,35 @@ EXCLUDE_FROM_BUILD = \
 	feedfs-qt \
 	jux3
 
+ifeq ($(JANWARE_USER),)
+  export JANWARE_USER = $(shell id -un)
+endif
+
+ifneq ($(CLONE_FROM_USER),)
+  export PGIT_CLONE_FROM_USER = $(CLONE_FROM_USER)
+else
+  export PGIT_CLONE_FROM_USER=$(JANWARE_USER)
+endif
+
+ifeq ($(CVSROOT),)
+  CVSROOT = :ext:$(JANWARE_USER)@cvs.jannet.de:/home/jannet/arc/cvs
+  export CVSROOT
+endif
+
+ifeq ($(CVS_RSH),)
+  CVS_RSH = ssh
+  export CVS_RSH
+endif
+
+# ------------ commands
+
+PGIT       = CLONE_PROJECTS="$(PROJECTS)" /bin/bash $(firstword $(wildcard ./ytools/devutil/scripts/pgit.sh /opt/ytools/bin/pgit.sh) pgit.sh-not-found)
+BUILD_PY   = python ./ytools/devutil/scripts/build.py -b $(shell pwd) $(BUILD_PY_EXTRA_ARGS)
+PURGE_SH   = /bin/bash $(firstword $(wildcard ./ytools/devutil/scripts/purge-stale-projects.sh /opt/ytools/bin/purge-stale-projects.sh) purge-not-found)
+RELEASE_SH = /bin/bash $(firstword $(wildcard ./ytools/devutil/scripts/build-release.sh /opt/ytools/bin/build-release.sh) release-not-found)
+
+# ------------ targets
+  
 all: pull.done
 
 all clean: pull.done