simplifications to Makefile; add clean target