Make Makefile better