cleanup and makefile correction