Cleanup and makefile