Simplified the Makefile