Makefile simplification