fix typo
cleanup of makefile
slightly simplify makefile