cleaned up Makefiles a bit