Makefile optimizations clean up