Further cleaned and updated Makefile.