Makefile cleanup
Rewrite makefile