clean up and add Makefile