Thomas's fix on Makefile + remove lines with tabs