cleaned up makefiles