Adding clean rule to Makefile and other minor changes