Simplify the Makefile