Ckeaning up Makefiles