Examples makefile cleanup and improvements