Expanded and simplified Makefile