diff --git a/Makefile b/Makefile
index 8750382312aae1197b06bb29eab2e6d3dc0701da..af89bf6f03cf3ed6b0cb5622b28f9276489b215e 100644
--- a/Makefile
+++ b/Makefile
@@ -92,10 +92,11 @@ static:
 	cppcheck --enable=all --suppress=missingIncludeSystem \
       $(SOURCES) *.h *.hpp
 
-# make identifier - will ensure that all source code and header files include
-#                   the project identifier
+# make identifier - will check to ensure that all source code and header files
+#                   include the project identifier; skip subdirectories;
+#                   also removes old submit tarballs, they are outdated
 identifier:
-	@if [ $$(grep --include=*.{h,hpp,c,cpp} -L $(IDENTIFIER) * | wc -l) -ne 0 ]; then echo "Missing project identifier"; exit 1; fi
+	@if [ $$(grep --include=*.{h,hpp,c,cpp} --directories=skip -L $(IDENTIFIER) * | wc -l) -ne 0 ]; then echo -n "Missing project identifier in file(s): ";echo `grep --include=*.{h,hpp,c,cpp} --directories=skip -L $(IDENTIFIER) *`;rm -f $(PARTIAL_SUBMITFILE) $(FULL_SUBMITFILE); exit 1; fi
 
 # Build both release and debug executables
 all: clean