Adding Makefile, cleaning up