Clean makefiles a little