Cleanups and improvements in Makefile