Makefile adjustments and clean up