clean up
improve Makefile