Cleanup+adjust makefile