Simplified Makefile some more