cleanup and makefile