Clean up
Add install to Makefile