Simplify Makefile further