Cleanup

Do a test and a Makefile