Some cleanups to Makefile