Makefile improvements (+small cleanup)