Some simplification to the Makefiles