Simplify and clean up Makefile