Simplify Makefile a bit