Clean up and add Makefile