clean up and add makefile