added make uninstall, cleanup Makefile