Simplified and made Makefile even more explicit