Clean up and add makefile