diff --git a/make/defs.mk b/make/defs.mk
index 0533ae55..8605491e 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -12,7 +12,7 @@ space                       := $(empty) $(empty)
 comma                       := ,
 Q                           ?= @
 
-# ----- executables
+# ----- Executables
 
 include $(JWBDIR)/make/projects.mk
 
@@ -99,7 +99,7 @@ ifndef PRISTINE_MAKE
   PRISTINE_MAKE             := umask $(MINIMAL_UMASK) && MAKEFLAGS=$(MINIMAL_MAKEFLAGS) LD_LIBRARY_PATH=$(MINIMAL_LD_LIBRARY_PATH) PATH=$(MINIMAL_PATH) $(MAKE)
 endif
 
-# ----- function definitions
+# ----- Function definitions
 
 reverse                      = $(if $(wordlist 2,2,$(1)),$(call reverse,$(wordlist 2,$(words $(1)),$(1))) $(firstword $(1)),$(1))
 make_subdirs                 = set -e; for D in $(SUBDIRS) ; do make -C $$D ; done
@@ -123,7 +123,7 @@ endef
 
 uniq                         = $(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1)))
 
-# ----- standard variables
+# ----- Standard variables
 
 ifeq ($(PROJECT),)
   PROJECT                   := $(shell $(ECHO) $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(realpath $(TOPDIR)))) | $(SED) 's/-[0-9]\+\..*//')
@@ -146,7 +146,7 @@ ifdef BUILD_LIBS_PREFIX
   endif
 endif
 
-# ----- user and organization
+# ----- User and organization
 
 ifndef BUILD_USER
   BUILD_USER                := $(shell $(ID) -un)
@@ -173,7 +173,7 @@ PUBLIC_PATH_DEVEL_DOC        = /doc/devel
 UPLOAD_URL_DEVEL_DOC         = rsync_ssh://$(JANWARE_USER)@janware.com:/srv/dav/pub/clients/$(JANWARE_CLIENT)/$(PUBLIC_PATH_DEVEL_DOC)
 PKG_VENDOR                  ?= janware GmbH
 
-# ----- packaging variables
+# ----- Packaging variables
 
 PKG_SH_EXE                  := /bin/bash $(JWB_SCRIPT_DIR)/pkg.sh
 LOG_INSTALL_SH              := $(PKG_SH_EXE) log-install -f $(PKG_FORMAT)
@@ -259,7 +259,7 @@ BUILD_NUMBER                 = $(word 4,$(DIST_VERSION_WORDS))
 MAJOR_MINOR_RELEASE          = $(MAJOR_VERSION).$(MINOR_VERSION).$(RELEASE_VERSION)
 CVS_RSH                     ?= /usr/bin/ssh
 
-# ----- input dirs
+# ----- Input dirs
 
 JW_PKG_DIR                   = $(JWBDIR)
 JW_PKG_CONF_BASE_DIR        ?= $(firstword $(wildcard $(JW_PKG_DIR)/conf /etc/opt/jw-pkg))
@@ -518,11 +518,11 @@ endif
 # ----- local.mk
 
 $(eval $(call try_include,$(JWBDIR)/make/local.mk))
-
-#-include $(JWBDIR)/make/local.mk
 $(eval $(call try_include,$(TOPDIR)/make/local.mk))
 $(eval $(call try_include,local.mk))
 
+# ----- Omnipresent rules
+
 all:
 
 nothing: