Refined the Makefile a bit