- Some clean ups in the Makefile